[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] df1c56: [fix]: define to avoid issue
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] df1c56: [fix]: define to avoid issue with external pdf mo... |
|
Date: |
Fri, 18 Mar 2016 03:54:30 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: df1c5697beff392030a693fe61abee9bb5d0a892
https://github.com/Dolibarr/dolibarr/commit/df1c5697beff392030a693fe61abee9bb5d0a892
Author: philippe grand <address@hidden>
Date: 2016-03-12 (Sat, 12 Mar 2016)
Changed paths:
M htdocs/commande/card.php
Log Message:
-----------
[fix]: define to avoid issue with external pdf models
Commit: adc552d5ff83603dfc5602f7119381a2f050fa1f
https://github.com/Dolibarr/dolibarr/commit/adc552d5ff83603dfc5602f7119381a2f050fa1f
Author: philippe grand <address@hidden>
Date: 2016-03-12 (Sat, 12 Mar 2016)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M dev/initdata/initdemo.sh
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
Commit: 5d88c10e943d67eb3fce03be6f50edb77eec2846
https://github.com/Dolibarr/dolibarr/commit/5d88c10e943d67eb3fce03be6f50edb77eec2846
Author: aspangaro <address@hidden>
Date: 2016-03-13 (Sun, 13 Mar 2016)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
Missing language file
Commit: 930dd55e1740e319ff3ba5460e060d2d3073a187
https://github.com/Dolibarr/dolibarr/commit/930dd55e1740e319ff3ba5460e060d2d3073a187
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-13 (Sun, 13 Mar 2016)
Changed paths:
A dev/initdata/mysqldump_dolibarr_3.9.0.sql
M dev/initdata/savedemo.sh
Log Message:
-----------
Prepare 3.9 release
Commit: b16ef1b4f4ceb25c85a727e87769a9bf05dcc47f
https://github.com/Dolibarr/dolibarr/commit/b16ef1b4f4ceb25c85a727e87769a9bf05dcc47f
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-13 (Sun, 13 Mar 2016)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.9.0.sql
Log Message:
-----------
Prepare 3.9 release
Commit: c35d8d1b8e9f6107f321cc586a271e79d4cf58f5
https://github.com/Dolibarr/dolibarr/commit/c35d8d1b8e9f6107f321cc586a271e79d4cf58f5
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-13 (Sun, 13 Mar 2016)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix publish on foundation server
Commit: 77c81397eaf05dd7e2e948c4b055c755f6d4584f
https://github.com/Dolibarr/dolibarr/commit/77c81397eaf05dd7e2e948c4b055c755f6d4584f
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-13 (Sun, 13 Mar 2016)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Version 3.9 final
Commit: 76c1af0e650482f52e7c8d93fcaf5ad20e31c697
https://github.com/Dolibarr/dolibarr/commit/76c1af0e650482f52e7c8d93fcaf5ad20e31c697
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-13 (Sun, 13 Mar 2016)
Changed paths:
M README.md
Log Message:
-----------
Fix typo
Commit: 08c5fd2e36af5b7b775cd7a73a35f914d58acee4
https://github.com/Dolibarr/dolibarr/commit/08c5fd2e36af5b7b775cd7a73a35f914d58acee4
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-14 (Mon, 14 Mar 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX #4809 - Duplicate functions with different content
Commit: 416766349122a1de59156d54dc912a4ea90896b7
https://github.com/Dolibarr/dolibarr/commit/416766349122a1de59156d54dc912a4ea90896b7
Author: aspangaro <address@hidden>
Date: 2016-03-15 (Tue, 15 Mar 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix: 3.9 Problem of rowspan in edit mode
Commit: ac1b4a90deb82c4e66795c2e9d9f504fd7d1b627
https://github.com/Dolibarr/dolibarr/commit/ac1b4a90deb82c4e66795c2e9d9f504fd7d1b627
Author: philippe grand <address@hidden>
Date: 2016-03-15 (Tue, 15 Mar 2016)
Changed paths:
M README.md
M build/makepack-dolibarr.pl
A dev/initdata/mysqldump_dolibarr_3.9.0.sql
M dev/initdata/savedemo.sh
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/filefunc.inc.php
Log Message:
-----------
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
Commit: 19d75772673da581e5e3beaad2bce074a8d9fede
https://github.com/Dolibarr/dolibarr/commit/19d75772673da581e5e3beaad2bce074a8d9fede
Author: Alexis Algoud <address@hidden>
Date: 2016-03-15 (Tue, 15 Mar 2016)
Changed paths:
M htdocs/projet/card.php
Log Message:
-----------
FIX Bad function name call on delete
Commit: 610249068d58a0fe67565518404d77ba85638fd5
https://github.com/Dolibarr/dolibarr/commit/610249068d58a0fe67565518404d77ba85638fd5
Author: Drosis Nikos <address@hidden>
Date: 2016-03-15 (Tue, 15 Mar 2016)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Fix syntax
SQL error when ordering product list
Commit: 1ded08abeffc754304c8beeb467d27b76e96432f
https://github.com/Dolibarr/dolibarr/commit/1ded08abeffc754304c8beeb467d27b76e96432f
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-15 (Tue, 15 Mar 2016)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
Log Message:
-----------
FIX When using option Price per level, when adding a predefined product,
the vat for customer was not correctly set.
Commit: ad942afbf1ea47f4af02bd29e0ce4007a7f251a8
https://github.com/Dolibarr/dolibarr/commit/ad942afbf1ea47f4af02bd29e0ce4007a7f251a8
Author: fmarcet <address@hidden>
Date: 2016-03-16 (Wed, 16 Mar 2016)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
FIX: Not showing sellprice properly on product list
Commit: a1bc5dcc310f10616e12ec31a3f8ce1622b5b650
https://github.com/Dolibarr/dolibarr/commit/a1bc5dcc310f10616e12ec31a3f8ce1622b5b650
Author: fmarcet <address@hidden>
Date: 2016-03-16 (Wed, 16 Mar 2016)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
FIX: Not showing sellprice properly on product list
Commit: a196a76132aca29222de6acad3ff2f1889d68d23
https://github.com/Dolibarr/dolibarr/commit/a196a76132aca29222de6acad3ff2f1889d68d23
Author: philippe grand <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
Log Message:
-----------
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
Commit: d2d38f58bf7d320b29e0047f516c4ec9a2744b9d
https://github.com/Dolibarr/dolibarr/commit/d2d38f58bf7d320b29e0047f516c4ec9a2744b9d
Author: Regis Houssin <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/user/card.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix: beware with merges in conflict !!
Commit: d434cee3faf0443376abd430591299ecae5e7bd0
https://github.com/Dolibarr/dolibarr/commit/d434cee3faf0443376abd430591299ecae5e7bd0
Author: philippe grand <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/core/class/commonobjectline.class.php
M htdocs/core/modules/modIncoterm.class.php
M htdocs/product/class/product.class.php
Log Message:
-----------
[Qual] Typo
Commit: 1683609d9a9befbd3429c2be4414015bfb7b8462
https://github.com/Dolibarr/dolibarr/commit/1683609d9a9befbd3429c2be4414015bfb7b8462
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/core/modules/barcode/mod_barcode_product_standard.php
Log Message:
-----------
FIX Check of EAN13 barcode when mask was set to use 13 digits instead of
12
Commit: aa7eb4935c5d4c60a115408d4ca64501e5968fcd
https://github.com/Dolibarr/dolibarr/commit/aa7eb4935c5d4c60a115408d4ca64501e5968fcd
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
FIX VAT rate can be negative. Example spain selling to morroco.
Commit: ae16d6c45cef0f9b65806af6c2c979ae5dcf8d2a
https://github.com/Dolibarr/dolibarr/commit/ae16d6c45cef0f9b65806af6c2c979ae5dcf8d2a
Author: Regis Houssin <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix: missing color update
Commit: a2bb57e33b4e1d544c1ec46e938402bb833110e4
https://github.com/Dolibarr/dolibarr/commit/a2bb57e33b4e1d544c1ec46e938402bb833110e4
Author: Regis Houssin <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix: use clone instead dol_clone
Commit: 2642b710ea56af94164a31d34bfb5e307fedf0a9
https://github.com/Dolibarr/dolibarr/commit/2642b710ea56af94164a31d34bfb5e307fedf0a9
Author: Regis Houssin <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/commande/card.php
Log Message:
-----------
Fix: missing model selected
Commit: 19e3c1b0894102ca8f3933894d5d23457bc591d2
https://github.com/Dolibarr/dolibarr/commit/19e3c1b0894102ca8f3933894d5d23457bc591d2
Author: Alexis Algoud <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/product/ajax/products.php
Log Message:
-----------
FIX finished parameters not used
Commit: 2c4f01859c6e37d4e5e5abcb8a6731a7386afbbb
https://github.com/Dolibarr/dolibarr/commit/2c4f01859c6e37d4e5e5abcb8a6731a7386afbbb
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/commande/card.php
M htdocs/core/class/commonobjectline.class.php
M htdocs/core/modules/modIncoterm.class.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #4802 from grandoc/3.9
[fix]: define to avoid issue with external pdf models
Commit: c61110935d47255ea2eb12d7bc81c862adcf3026
https://github.com/Dolibarr/dolibarr/commit/c61110935d47255ea2eb12d7bc81c862adcf3026
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
Merge pull request #4803 from aspangaro/3.9-p17
FIX Missing language file loading
Commit: 76896e92a63ecc509625a756cc0c6ea511178690
https://github.com/Dolibarr/dolibarr/commit/76896e92a63ecc509625a756cc0c6ea511178690
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/projet/card.php
Log Message:
-----------
Merge pull request #4822 from atm-alexis/FIX_bad_function_name
FIX # Bad function name setEventMessagess call on project delete
Commit: fb16feb666a5124a279d44c8ae78aa5ba9603385
https://github.com/Dolibarr/dolibarr/commit/fb16feb666a5124a279d44c8ae78aa5ba9603385
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/projet/card.php
Log Message:
-----------
FIX Same term to create than other objects
Commit: a102dc29d4513a3b6196bb3715d6996847c805b5
https://github.com/Dolibarr/dolibarr/commit/a102dc29d4513a3b6196bb3715d6996847c805b5
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/commande/card.php
M htdocs/core/class/commonobjectline.class.php
M htdocs/core/modules/modIncoterm.class.php
M htdocs/product/class/product.class.php
M htdocs/projet/card.php
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 22f6e0e92d120fdac910c495c58e687bff3b11a3
https://github.com/Dolibarr/dolibarr/commit/22f6e0e92d120fdac910c495c58e687bff3b11a3
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Merge pull request #4831 from fmarcet/3.9
FIX: Not showing sellprice properly on product list
Commit: e5f0027dbf35d03e059d9400ff711b6377f3de27
https://github.com/Dolibarr/dolibarr/commit/e5f0027dbf35d03e059d9400ff711b6377f3de27
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Merge pull request #4823 from ndrosis/3.9
FIX SQL syntax error in export
Commit: bbcc7d83ea17fbe99a83abfde4309111ab379094
https://github.com/Dolibarr/dolibarr/commit/bbcc7d83ea17fbe99a83abfde4309111ab379094
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/user/card.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge pull request #4834 from hregis/3.9_bug
Fix: beware with merges in conflict !!
Commit: 404ac60226f7ec2e1ea9c4654940a52bb46453ef
https://github.com/Dolibarr/dolibarr/commit/404ac60226f7ec2e1ea9c4654940a52bb46453ef
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/product/list.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 75ed221fb8911b185084cf056eb3c0a44c5b8bab
https://github.com/Dolibarr/dolibarr/commit/75ed221fb8911b185084cf056eb3c0a44c5b8bab
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix regression with last PR: change of password was not working.
Commit: 18804ee9297bdf0af8f228824e21ba378417fe30
https://github.com/Dolibarr/dolibarr/commit/18804ee9297bdf0af8f228824e21ba378417fe30
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
FIX Bad color of message password changed
Commit: e2013579074845639fb6e9721006ba9e37c40ee9
https://github.com/Dolibarr/dolibarr/commit/e2013579074845639fb6e9721006ba9e37c40ee9
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Merge pull request #4817 from aspangaro/3.9-p19
Fix: 3.9 Problem of rowspan in edit mode on user card
Commit: dc78cc7ced37e3f4fea0e56a7d02e3265c30f0ec
https://github.com/Dolibarr/dolibarr/commit/dc78cc7ced37e3f4fea0e56a7d02e3265c30f0ec
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/commande/card.php
Log Message:
-----------
Merge pull request #4837 from hregis/3.9_order
Fix: missing model selected
Commit: b023aa317f2e79112c5f73220068867692a5169c
https://github.com/Dolibarr/dolibarr/commit/b023aa317f2e79112c5f73220068867692a5169c
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/product/ajax/products.php
Log Message:
-----------
Merge pull request #4840 from atm-alexis/3.8_FIX_finished_param_not_use
FIX finished parameters not used
Commit: 7fa71214bce679371cbcea7faf3a3fa1cc9cf793
https://github.com/Dolibarr/dolibarr/commit/7fa71214bce679371cbcea7faf3a3fa1cc9cf793
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/product/ajax/products.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
Commit: 2b1f57f01e79832a84054905436a6251fa5f6430
https://github.com/Dolibarr/dolibarr/commit/2b1f57f01e79832a84054905436a6251fa5f6430
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M ChangeLog
M README.md
M build/makepack-dolibarr.pl
A dev/initdemo/mysqldump_dolibarr_3.9.0.sql
M dev/initdemo/savedemo.sh
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commonobjectline.class.php
M htdocs/core/modules/barcode/mod_barcode_product_standard.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modIncoterm.class.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/projet/card.php
M htdocs/societe/consumption.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/44dc07a61bc7...2b1f57f01e79