[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1523b2: FIX #7222
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1523b2: FIX #7222 |
Date: |
Fri, 01 Sep 2017 08:35:14 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 1523b2ef8095cd95f46e617d7a75cb18054780d1
https://github.com/Dolibarr/dolibarr/commit/1523b2ef8095cd95f46e617d7a75cb18054780d1
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M htdocs/install/mysql/data/llx_accounting.sql
Log Message:
-----------
FIX #7222
Commit: 07f7db1b6d17de941b9473853729ddc38b003bb2
https://github.com/Dolibarr/dolibarr/commit/07f7db1b6d17de941b9473853729ddc38b003bb2
Author: atm-quentin <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX createFromCurrent lastvalue
Commit: e9cdf852868a3744b838c1fe762870a4321bcf2c
https://github.com/Dolibarr/dolibarr/commit/e9cdf852868a3744b838c1fe762870a4321bcf2c
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Fxi repeair of collation
Commit: 22ca29a51febce118d726fdc6f1f0d5a4369c6eb
https://github.com/Dolibarr/dolibarr/commit/22ca29a51febce118d726fdc6f1f0d5a4369c6eb
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/core/menus/standard/auguria.lib.php
Log Message:
-----------
Fix sql syntax error
Commit: eebaff95cf6a3f2ca9e384a355f1537da8d6b312
https://github.com/Dolibarr/dolibarr/commit/eebaff95cf6a3f2ca9e384a355f1537da8d6b312
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix pb with imagick
Commit: 8f01db10a6a77c5938d1e49d3e95311d1e181aae
https://github.com/Dolibarr/dolibarr/commit/8f01db10a6a77c5938d1e49d3e95311d1e181aae
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
Log Message:
-----------
Fix setup for india
Commit: 7218a9de0ebb781f0a73dfdedae3dbb6beb83925
https://github.com/Dolibarr/dolibarr/commit/7218a9de0ebb781f0a73dfdedae3dbb6beb83925
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
Log Message:
-----------
Fix translation of total VAT
Commit: d96a83adaccf74d19bea6ccd1be54d6e6d2cb093
https://github.com/Dolibarr/dolibarr/commit/d96a83adaccf74d19bea6ccd1be54d6e6d2cb093
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Fix bad total included tax when mutlicurrency is on
Commit: e862ba9daf02bab51a5876e182d8bd4e566d6142
https://github.com/Dolibarr/dolibarr/commit/e862ba9daf02bab51a5876e182d8bd4e566d6142
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
NEW Add detail of all tax rates into pdf column tax sale.
Commit: dabd8820560c549355456e78498b07a2cde1e3df
https://github.com/Dolibarr/dolibarr/commit/dabd8820560c549355456e78498b07a2cde1e3df
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Use a slash
Commit: 044feab00fd887d226e64863475b945861589cc8
https://github.com/Dolibarr/dolibarr/commit/044feab00fd887d226e64863475b945861589cc8
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/holiday/list.php
Log Message:
-----------
Fix duplicate code
Commit: 945fb61e591193c3c8bf92a3004426facfc7120d
https://github.com/Dolibarr/dolibarr/commit/945fb61e591193c3c8bf92a3004426facfc7120d
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Update facture.class.php
Commit: 8ca2bbecc6a595847ea2d6568030472df6be998f
https://github.com/Dolibarr/dolibarr/commit/8ca2bbecc6a595847ea2d6568030472df6be998f
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #7305 from atm-quentin/6.0
FIX createFromCurrent lastvalue
Commit: 6c202c5fa1910347f66ec85eaef35938bd5d7133
https://github.com/Dolibarr/dolibarr/commit/6c202c5fa1910347f66ec85eaef35938bd5d7133
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/core/lib/pdf.lib.php
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Fix vat rate to show and not vat amount
Commit: 2cf924ab74bf9364592507a883ecc29ef7fd5210
https://github.com/Dolibarr/dolibarr/commit/2cf924ab74bf9364592507a883ecc29ef7fd5210
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 991a33f7b67a34a0e7aee41f473cbfe36661adae
https://github.com/Dolibarr/dolibarr/commit/991a33f7b67a34a0e7aee41f473cbfe36661adae
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/objectline_view.tpl.php
Log Message:
-----------
Make different vat rates visible
Commit: 4998eb3061cb403f283202a6be0f2e197a39623d
https://github.com/Dolibarr/dolibarr/commit/4998eb3061cb403f283202a6be0f2e197a39623d
Author: Alexandre SPANGARO <address@hidden>
Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths:
M htdocs/compta/bank/index.php
Log Message:
-----------
Fix: Accountancy journal, fetch on rowid, not code
Commit: d3c95e030baafb3da50f5e4a30e31c429aa85d63
https://github.com/Dolibarr/dolibarr/commit/d3c95e030baafb3da50f5e4a30e31c429aa85d63
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/comm/propal/document.php
M htdocs/commande/document.php
M htdocs/compta/facture/document.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/supplier_proposal/document.php
Log Message:
-----------
Fix delete file not possible for external user even with permissions
Commit: bfc5f01e1ea364c068f4e9e1f912173e0c3861f6
https://github.com/Dolibarr/dolibarr/commit/bfc5f01e1ea364c068f4e9e1f912173e0c3861f6
Author: Juanjo Menent <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/admin/pdf.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
NEW Add detail of all tax rates into pdf column tax sale.
-Can be hidden by pdf setup page
-For know if localtax is applied into line we have to read totaltax line
Commit: d5a9d32778f9ecd38e2ecf64e01bfc041ec4fc8a
https://github.com/Dolibarr/dolibarr/commit/d5a9d32778f9ecd38e2ecf64e01bfc041ec4fc8a
Author: Juanjo Menent <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/comm/propal/document.php
M htdocs/commande/document.php
M htdocs/compta/facture/document.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/supplier_proposal/document.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/6.0' into 6.0
Commit: 70cbaeb423684fe231b61f509459e6dcb6b15bd8
https://github.com/Dolibarr/dolibarr/commit/70cbaeb423684fe231b61f509459e6dcb6b15bd8
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Fix mass merging must read only PDF generated for REF.
Commit: c028771ad0a62c26c64eaac5185f624633372b73
https://github.com/Dolibarr/dolibarr/commit/c028771ad0a62c26c64eaac5185f624633372b73
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/compta/bank/index.php
Log Message:
-----------
Merge pull request #7306 from aspangaro/6.0-rc_p2
Fix: Bank index | Accountancy journal, fetch on rowid, not code
Commit: a3085cb44a95afd7453f12e33362158ad5c27dca
https://github.com/Dolibarr/dolibarr/commit/a3085cb44a95afd7453f12e33362158ad5c27dca
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/core/tpl/objectline_view.tpl.php
Log Message:
-----------
Update objectline_view.tpl.php
Commit: 2c4e8cbb4a9cc12b5c829560978c04a766423ccd
https://github.com/Dolibarr/dolibarr/commit/2c4e8cbb4a9cc12b5c829560978c04a766423ccd
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Update admin.lang
Commit: 3e4a7ba97cde90c818666b37f4a01042c0a0e314
https://github.com/Dolibarr/dolibarr/commit/3e4a7ba97cde90c818666b37f4a01042c0a0e314
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Update admin.lang
Commit: b65db49868aae2f2eedc8eb3359f92064b354339
https://github.com/Dolibarr/dolibarr/commit/b65db49868aae2f2eedc8eb3359f92064b354339
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/admin/pdf.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge pull request #7309 from simnandez/6.0
NEW Add detail of all tax rates into pdf column tax sale.
Commit: 0a67ca53d450e5850b6d9280f56ebbccf282870a
https://github.com/Dolibarr/dolibarr/commit/0a67ca53d450e5850b6d9280f56ebbccf282870a
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
Log Message:
-----------
Fix menu auguria
Commit: e71409b7c8e999318da2ebaf969b780b53331522
https://github.com/Dolibarr/dolibarr/commit/e71409b7c8e999318da2ebaf969b780b53331522
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths:
M htdocs/admin/pdf.php
M htdocs/compta/bank/index.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 6a3d110d3ac1339e7a60664d03378719959aaf30
https://github.com/Dolibarr/dolibarr/commit/6a3d110d3ac1339e7a60664d03378719959aaf30
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-31 (Thu, 31 Aug 2017)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Enhance repair for utf8 mix collation
Commit: 2ab12f54ff33beee452e3881230df751cb969e43
https://github.com/Dolibarr/dolibarr/commit/2ab12f54ff33beee452e3881230df751cb969e43
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-31 (Thu, 31 Aug 2017)
Changed paths:
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_holiday_config.sql
Log Message:
-----------
Fix install error due to too large column with index
Commit: d88a75b6668f5b2be1685089f6f4faa58015b26f
https://github.com/Dolibarr/dolibarr/commit/d88a75b6668f5b2be1685089f6f4faa58015b26f
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-01 (Fri, 01 Sep 2017)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix typo
Commit: 2768878618587f0cc4caf08bac01b014d43275af
https://github.com/Dolibarr/dolibarr/commit/2768878618587f0cc4caf08bac01b014d43275af
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-01 (Fri, 01 Sep 2017)
Changed paths:
M htdocs/core/class/CSMSFile.class.php
Log Message:
-----------
FIX Bad condition on sms log debug
Commit: 223e1b1cd4228e42cd63f97917b803ccae73cb1a
https://github.com/Dolibarr/dolibarr/commit/223e1b1cd4228e42cd63f97917b803ccae73cb1a
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-01 (Fri, 01 Sep 2017)
Changed paths:
M htdocs/core/class/CSMSFile.class.php
Log Message:
-----------
Fix missing the nostop tag
Commit: 4660bc58fc80c5921373307f4d0b9a200aceadb2
https://github.com/Dolibarr/dolibarr/commit/4660bc58fc80c5921373307f4d0b9a200aceadb2
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-01 (Fri, 01 Sep 2017)
Changed paths:
M htdocs/core/class/CSMSFile.class.php
M htdocs/core/class/html.formsms.class.php
M htdocs/langs/en_US/sms.lang
Log Message:
-----------
Fix nostop option
Commit: 0d0b7f8af27d7f2a604e4d31cbfca15e04bc8538
https://github.com/Dolibarr/dolibarr/commit/0d0b7f8af27d7f2a604e4d31cbfca15e04bc8538
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-01 (Fri, 01 Sep 2017)
Changed paths:
M htdocs/societe/tpl/linesalesrepresentative.tpl.php
Log Message:
-----------
Fix email
Commit: 4b9f54e571107f07ee5fa328be0d293dd4b96b10
https://github.com/Dolibarr/dolibarr/commit/4b9f54e571107f07ee5fa328be0d293dd4b96b10
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-01 (Fri, 01 Sep 2017)
Changed paths:
M ChangeLog
M htdocs/admin/pdf.php
M htdocs/comm/propal/document.php
M htdocs/commande/document.php
M htdocs/compta/bank/index.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/document.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/holiday/list.php
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
M htdocs/societe/tpl/linesalesrepresentative.tpl.php
M htdocs/supplier_proposal/document.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
Compare:
https://github.com/Dolibarr/dolibarr/compare/9b51810653c2...4b9f54e57110
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 1523b2: FIX #7222,
Laurent Destailleur <=