[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 395066: Fix: [ bug #1163 ] SQL Error
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 395066: Fix: [ bug #1163 ] SQL Error when searching for su... |
|
Date: |
Sat, 07 Dec 2013 15:43:12 -0800 |
Branch: refs/heads/3.5
Home: https://github.com/Dolibarr/dolibarr
Commit: 395066519b5c7f3d6dafa8dcdd45583509f612d1
https://github.com/Dolibarr/dolibarr/commit/395066519b5c7f3d6dafa8dcdd45583509f612d1
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/fourn/commande/liste.php
Log Message:
-----------
Fix: [ bug #1163 ] SQL Error when searching for supplier orders
Commit: 8f1a5533951ccd7847252fa2f3315a836ecffbd6
https://github.com/Dolibarr/dolibarr/commit/8f1a5533951ccd7847252fa2f3315a836ecffbd6
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Fix: [ bug #1162 ] Traduction des mi-journées
Commit: 84e345702378c617d6ce1ff9df6cdbe022ae5f7e
https://github.com/Dolibarr/dolibarr/commit/84e345702378c617d6ce1ff9df6cdbe022ae5f7e
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/societe/consumption.php
Log Message:
-----------
Fix: [ bug #1161 ] Search on product label
Commit: eaa6d987b6012e7d45f924fa8146b9096d5e7172
https://github.com/Dolibarr/dolibarr/commit/eaa6d987b6012e7d45f924fa8146b9096d5e7172
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/ecm/ajax/ecmdatabase.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/index.php
M htdocs/ecm/tpl/builddatabase.tpl.php
Log Message:
-----------
Fix: When database is not synchronized with dir, we clean database.
Commit: fdc12099860f65e258b29207704d0be353fc4289
https://github.com/Dolibarr/dolibarr/commit/fdc12099860f65e258b29207704d0be353fc4289
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: [ bug #1163 ] SQL Error when searching for supplier orders
Conflicts:
ChangeLog
Commit: 2f88406677c94686040c8c607d5f4cb45d477ebc
https://github.com/Dolibarr/dolibarr/commit/2f88406677c94686040c8c607d5f4cb45d477ebc
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/cashdesk/validation_verif.php
Log Message:
-----------
Fix: [ bug #1075 ] POS module doesn't decrement stock of products in
Delayed payment mode.
Commit: 131bbce6f3c60854368ee2b98214929e2e73fad1
https://github.com/Dolibarr/dolibarr/commit/131bbce6f3c60854368ee2b98214929e2e73fad1
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update changelog
Commit: c54c06e8d320bf6859aa4fe40397ae9b79c85924
https://github.com/Dolibarr/dolibarr/commit/c54c06e8d320bf6859aa4fe40397ae9b79c85924
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Fix: [ bug #1171 ] Documents lost in interventions after validating
Commit: 4aea74d6fd7807a6154e1eb3dc9eac3897074489
https://github.com/Dolibarr/dolibarr/commit/4aea74d6fd7807a6154e1eb3dc9eac3897074489
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: [ bug #1171 ] Documents lost in interventions after validating
Commit: c6991f97d40a3e710900dcb12bd9e06ef7e3f68c
https://github.com/Dolibarr/dolibarr/commit/c6991f97d40a3e710900dcb12bd9e06ef7e3f68c
Author: Florian Henry <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
[ bug #1174 ] Product translated description not good into PDF
Country
Commit: 11efc207559f005ce8edaa8966821047ba29ad5b
https://github.com/Dolibarr/dolibarr/commit/11efc207559f005ce8edaa8966821047ba29ad5b
Author: Florian Henry <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/cashdesk/validation_verif.php
M htdocs/ecm/ajax/ecmdatabase.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/index.php
M htdocs/ecm/tpl/builddatabase.tpl.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/commande/liste.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Conflicts:
ChangeLog
Change-Id: I90f7ee62c65ef449c8ca43857d9743d0d953cf4b
Commit: ff9c84fd0e8fd6e1cd1939f77ad1a3145578e62a
https://github.com/Dolibarr/dolibarr/commit/ff9c84fd0e8fd6e1cd1939f77ad1a3145578e62a
Author: Florian Henry <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Better test for HTMLentities desc translation
Commit: c0ef63fd746e99f31eb1870e5048108441d11c68
https://github.com/Dolibarr/dolibarr/commit/c0ef63fd746e99f31eb1870e5048108441d11c68
Author: Florian Henry <address@hidden>
Date: 2013-12-01 (Sun, 01 Dec 2013)
Changed paths:
M htdocs/comm/propal.php
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Bteer fix
Commit: 1b38d36f2884a56e3e265f3cf6a1b099489d791f
https://github.com/Dolibarr/dolibarr/commit/1b38d36f2884a56e3e265f3cf6a1b099489d791f
Author: Florian Henry <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Better Fix
Commit: 1ad1b25f6e6f19040d0eb559a6a8e2b312f5981f
https://github.com/Dolibarr/dolibarr/commit/1ad1b25f6e6f19040d0eb559a6a8e2b312f5981f
Author: Florian Henry <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
remove useless space
Commit: 0907d81fcb816263ae2ddfc1b4b2179b492bde4a
https://github.com/Dolibarr/dolibarr/commit/0907d81fcb816263ae2ddfc1b4b2179b492bde4a
Author: Florian Henry <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Avoid strpos bug if string is empty or null
Commit: 3e712c9c8c8f33a80d74ab04e965394aeea5d7b3
https://github.com/Dolibarr/dolibarr/commit/3e712c9c8c8f33a80d74ab04e965394aeea5d7b3
Author: Florian Henry <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Finnaly make it works
Commit: bc4cfd66dbd13c12f498527dcba108dd7abb64a7
https://github.com/Dolibarr/dolibarr/commit/bc4cfd66dbd13c12f498527dcba108dd7abb64a7
Author: Florian Henry <address@hidden>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/comm/mailing/fiche.php
Log Message:
-----------
Fix: fix unsubscribe URL into mailing when sending manually (not by
script)
Commit: c2a8967b52cf3b154be7d35fdec1eaa427156111
https://github.com/Dolibarr/dolibarr/commit/c2a8967b52cf3b154be7d35fdec1eaa427156111
Author: Florian Henry <address@hidden>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Much better fix for translated product description into PDF
Commit: d4c007a9094dfb1cb76e698f56e215a7cc347ccf
https://github.com/Dolibarr/dolibarr/commit/d4c007a9094dfb1cb76e698f56e215a7cc347ccf
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/comm/mailing/fiche.php
M htdocs/comm/propal.php
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Merge pull request #1335 from FHenry/3.4
[ bug #1174 ] Product translated description not good into PDF Country
Commit: 73e60e0629c4af5da868ec4e1c19b6ba7e6b4bd3
https://github.com/Dolibarr/dolibarr/commit/73e60e0629c4af5da868ec4e1c19b6ba7e6b4bd3
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Fix: Mass update of vat must work also for supplier prices
Conflicts:
htdocs/product/admin/product_tools.php
Commit: b637b28c8b5f086b9a6586f3e15c24c10b565e84
https://github.com/Dolibarr/dolibarr/commit/b637b28c8b5f086b9a6586f3e15c24c10b565e84
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M htdocs/.gitignore
Log Message:
-----------
Update ignore files
Commit: d8cd7571ec1117b1e2cf33b0802954148107a147
https://github.com/Dolibarr/dolibarr/commit/d8cd7571ec1117b1e2cf33b0802954148107a147
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 37b0780523fce7cd5d31f6150236704c5378195f
https://github.com/Dolibarr/dolibarr/commit/37b0780523fce7cd5d31f6150236704c5378195f
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-07 (Sat, 07 Dec 2013)
Changed paths:
M ChangeLog
M htdocs/comm/propal.php
M htdocs/core/lib/pdf.lib.php
M htdocs/ecm/ajax/ecmdatabase.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/index.php
M htdocs/ecm/tpl/builddatabase.tpl.php
M htdocs/fourn/commande/liste.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/societe/consumption.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/0e819ab5cdf2...37b0780523fc