[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1a71e9: FIX add supplierproposaldet w
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1a71e9: FIX add supplierproposaldet without price (new pro... |
|
Date: |
Sat, 15 Jul 2017 12:25:25 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 1a71e9b4a0377f2c42ebdccd65aa73c5bd73a6cb
https://github.com/Dolibarr/dolibarr/commit/1a71e9b4a0377f2c42ebdccd65aa73c5bd73a6cb
Author: arnaud <address@hidden>
Date: 2017-07-05 (Wed, 05 Jul 2017)
Changed paths:
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
FIX add supplierproposaldet without price (new product)
Commit: 3d18c71201bc22c5ff5377418812e66caf774362
https://github.com/Dolibarr/dolibarr/commit/3d18c71201bc22c5ff5377418812e66caf774362
Author: alexis Algoud <address@hidden>
Date: 2017-07-05 (Wed, 05 Jul 2017)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
FIX invoice situation VAT total rounding into PDF crabe
Commit: 249bfa3412517f30c95f50de9426393ebc9a36ae
https://github.com/Dolibarr/dolibarr/commit/249bfa3412517f30c95f50de9426393ebc9a36ae
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Merge pull request #7117 from atm-arnaud/FIX_insert_supplierpropale_det
Fix add supplierproposaldet without price (new product)
Commit: b461d24f52c347396f7abcd7777fcf0baff22bd2
https://github.com/Dolibarr/dolibarr/commit/b461d24f52c347396f7abcd7777fcf0baff22bd2
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
Merge pull request #7119 from atm-alexis/FIX_situ_pdf_total_VAT
FIX invoice situation VAT total rounding into PDF crabe
Commit: f166c96ed5a5065c1fffedaefadee8b5eb972c8f
https://github.com/Dolibarr/dolibarr/commit/f166c96ed5a5065c1fffedaefadee8b5eb972c8f
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-07-09 (Sun, 09 Jul 2017)
Changed paths:
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Fix : script to migrate photo path
Commit: 253f7e252d9b16ef6d720466192a3bc795184924
https://github.com/Dolibarr/dolibarr/commit/253f7e252d9b16ef6d720466192a3bc795184924
Author: Laurent Dinclaux <address@hidden>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M htdocs/compta/localtax/quadri_detail.php
M htdocs/core/lib/tax.lib.php
Log Message:
-----------
Fixes local taxes repports by rate
Commit: 244574f8e6d576f5e22c7d33b13730a4e1217f54
https://github.com/Dolibarr/dolibarr/commit/244574f8e6d576f5e22c7d33b13730a4e1217f54
Author: Laurent Dinclaux <address@hidden>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M htdocs/core/lib/tax.lib.php
Log Message:
-----------
Fixes functions comments
Commit: 64a5be3e0092fccfc1fd43bef9d9f4d5fb045737
https://github.com/Dolibarr/dolibarr/commit/64a5be3e0092fccfc1fd43bef9d9f4d5fb045737
Author: Laurent Dinclaux <address@hidden>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M htdocs/core/lib/tax.lib.php
Log Message:
-----------
Fixes travis error: Arguments with default values must be at the end of the
argument list
Commit: 715280b03aadf48060165730983039947b4ec434
https://github.com/Dolibarr/dolibarr/commit/715280b03aadf48060165730983039947b4ec434
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge pull request #7131 from atm-maxime/4.0
Fix : script to migrate photo path
Commit: 1617deeb81912e1a9a5bff60b6e4c7f348028bdd
https://github.com/Dolibarr/dolibarr/commit/1617deeb81912e1a9a5bff60b6e4c7f348028bdd
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M htdocs/compta/localtax/quadri_detail.php
M htdocs/core/lib/tax.lib.php
Log Message:
-----------
Merge pull request #7132 from Gecka-Apps/5.0-fix1
Fixes local taxes repports by rate
Commit: 017b654acd8c2a956d13c162b39ba2f58accc1f7
https://github.com/Dolibarr/dolibarr/commit/017b654acd8c2a956d13c162b39ba2f58accc1f7
Author: florian HENRY <address@hidden>
Date: 2017-07-11 (Tue, 11 Jul 2017)
Changed paths:
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
Log Message:
-----------
FIX PgSQL
Commit: cd3d18cb4d36d7f0874ee61110857495cc70463f
https://github.com/Dolibarr/dolibarr/commit/cd3d18cb4d36d7f0874ee61110857495cc70463f
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Fix detection of payment for credit note
Commit: cbef85ddefa1fb3b68e6a08740bdfc262e764239
https://github.com/Dolibarr/dolibarr/commit/cbef85ddefa1fb3b68e6a08740bdfc262e764239
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/compta/localtax/quadri_detail.php
M htdocs/core/lib/tax.lib.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 6023e686a4c0f48308f025e1698f9092e6527fed
https://github.com/Dolibarr/dolibarr/commit/6023e686a4c0f48308f025e1698f9092e6527fed
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
Log Message:
-----------
Merge pull request #7139 from atm-florian/5.0_fixmigMG
FIX PgSQL
Commit: de66971d93437c90790d18ffc3d8fa560f72214a
https://github.com/Dolibarr/dolibarr/commit/de66971d93437c90790d18ffc3d8fa560f72214a
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M htdocs/core/modules/modFournisseur.class.php
Log Message:
-----------
Fix bad setup
Commit: 24ecd48b22e5fbfa2e0a81a6ab4ab18fef1d8639
https://github.com/Dolibarr/dolibarr/commit/24ecd48b22e5fbfa2e0a81a6ab4ab18fef1d8639
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/compta/bank/bankentries.php
Log Message:
-----------
Minor fix
Commit: cb87b314be0cc5753257e2a19ac7fe5de913664d
https://github.com/Dolibarr/dolibarr/commit/cb87b314be0cc5753257e2a19ac7fe5de913664d
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_bank.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/banks.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/salaries.lang
M htdocs/modulebuilder/template/myobject_card.php
Log Message:
-----------
FIX Maxi debug of journalization of bank journal.
Commit: 4055ac82ab0b5d4ef939d25a325c2d5236c1637e
https://github.com/Dolibarr/dolibarr/commit/4055ac82ab0b5d4ef939d25a325c2d5236c1637e
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: ab6646d16b9975e89a2edbbd0d20731b4bcab0a8
https://github.com/Dolibarr/dolibarr/commit/ab6646d16b9975e89a2edbbd0d20731b4bcab0a8
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/core/lib/tax.lib.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/bank/bankentries.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
Commit: 0763d15b4c5d4418b1a1e9126928697208042ff2
https://github.com/Dolibarr/dolibarr/commit/0763d15b4c5d4418b1a1e9126928697208042ff2
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/user/bank.php
M htdocs/user/class/userbankaccount.class.php
Log Message:
-----------
Debug journalization
Debug edition of user BAN.
Commit: 1735a649e94b80778ebb45bbbc6dbf8d392308f9
https://github.com/Dolibarr/dolibarr/commit/1735a649e94b80778ebb45bbbc6dbf8d392308f9
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/compta/salaries/card.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix permission on salary module
Commit: 248717ccac84439c51246324ba517cc43765fecd
https://github.com/Dolibarr/dolibarr/commit/248717ccac84439c51246324ba517cc43765fecd
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
Log Message:
-----------
Fix refresh of list when change were done
Commit: 03d9cbb170672502efbd4f1b971a34ba774a72ee
https://github.com/Dolibarr/dolibarr/commit/03d9cbb170672502efbd4f1b971a34ba774a72ee
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
Log Message:
-----------
Fix refresh of list when change were done
Commit: c6dcccba18a447d7a3314e498df1e8cc733d8051
https://github.com/Dolibarr/dolibarr/commit/c6dcccba18a447d7a3314e498df1e8cc733d8051
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Fix better warning when record will be saved into a waiting account.
Commit: f9b9a9972ebac4440825ad2cb70f5b5a98c3d8bf
https://github.com/Dolibarr/dolibarr/commit/f9b9a9972ebac4440825ad2cb70f5b5a98c3d8bf
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Fix value not defined
Commit: a20bf05c64ab31d4cb7791abd0d20b3aa378da7c
https://github.com/Dolibarr/dolibarr/commit/a20bf05c64ab31d4cb7791abd0d20b3aa378da7c
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/bookkeeping/listbyaccount.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Debug journalization
Commit: 644486b4a0549ec4b7af8a4aacb305f822a7802e
https://github.com/Dolibarr/dolibarr/commit/644486b4a0549ec4b7af8a4aacb305f822a7802e
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/fourn/card.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix css
Commit: fa00373e56459c5cc600a639b819348a5dfbd841
https://github.com/Dolibarr/dolibarr/commit/fa00373e56459c5cc600a639b819348a5dfbd841
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix remove log
Commit: d671421b8be23d3d0f377ab3a9c8f54712dbca73
https://github.com/Dolibarr/dolibarr/commit/d671421b8be23d3d0f377ab3a9c8f54712dbca73
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Fix journalization of vat payments
Commit: bab963ec078de2db92f69f4d28c5e3ab54fe3387
https://github.com/Dolibarr/dolibarr/commit/bab963ec078de2db92f69f4d28c5e3ab54fe3387
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyaccount.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/compta/bank/bankentries.php
Log Message:
-----------
FIX Pagination on the ledger page.
Commit: 3cd21ee659a775dd3226a47af826968417c3f090
https://github.com/Dolibarr/dolibarr/commit/3cd21ee659a775dd3226a47af826968417c3f090
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/releve.php
Log Message:
-----------
Fix sort order
Commit: 4e45c7fdbaa114ce867e4093c862b30e918c2005
https://github.com/Dolibarr/dolibarr/commit/4e45c7fdbaa114ce867e4093c862b30e918c2005
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
Commit: e5513cff91e89b4f1c4fcf76ace394ffd42ece40
https://github.com/Dolibarr/dolibarr/commit/e5513cff91e89b4f1c4fcf76ace394ffd42ece40
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/accountancy/journal/bankjournal.php
Commit: 75ec7a309cd14b8636713903a785eca1c901081c
https://github.com/Dolibarr/dolibarr/commit/75ec7a309cd14b8636713903a785eca1c901081c
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-15 (Sat, 15 Jul 2017)
Changed paths:
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyaccount.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/bank/releve.php
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/salaries/card.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
M htdocs/install/mysql/tables/llx_bank.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/banks.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/salaries.lang
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/user/bank.php
M htdocs/user/class/userbankaccount.class.php
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/0fc56d2bcd36...75ec7a309cd1