[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c77fda: New accountancy menu for augu
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c77fda: New accountancy menu for auguria |
|
Date: |
Tue, 02 Feb 2016 18:27:34 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: c77fda5128b2f467bead144bbf83e9f7478cd799
https://github.com/Dolibarr/dolibarr/commit/c77fda5128b2f467bead144bbf83e9f7478cd799
Author: aspangaro <address@hidden>
Date: 2016-01-31 (Sun, 31 Jan 2016)
Changed paths:
M htdocs/core/class/menu.class.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
Log Message:
-----------
New accountancy menu for auguria
Commit: 2fa01a17548f6f2b8dee328e0d4011e6122e2685
https://github.com/Dolibarr/dolibarr/commit/2fa01a17548f6f2b8dee328e0d4011e6122e2685
Author: aspangaro <address@hidden>
Date: 2016-01-31 (Sun, 31 Jan 2016)
Changed paths:
M htdocs/comm/mailing/cibles.php
M htdocs/commande/orderstoinvoice.php
M htdocs/contrat/card.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/modules/modECM.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/expedition/list.php
M htdocs/imports/import.php
M htdocs/langs/ar_SA/main.lang
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p9
Commit: 165b553a79dce83d84d4af2ab2fe0fd174c12ecc
https://github.com/Dolibarr/dolibarr/commit/165b553a79dce83d84d4af2ab2fe0fd174c12ecc
Author: Florian HENRY <address@hidden>
Date: 2016-02-01 (Mon, 01 Feb 2016)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/fiscalyear.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/admin/fiscalyear_info.php
M htdocs/accountancy/admin/importaccounts.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/admin/journal.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/balancebymonth.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyyear.php
M htdocs/accountancy/class/accountancysystem.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/class/html.formventilation.class.php
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/index.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/index.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
M htdocs/accountancy/tpl/export_journal.tpl.php
Log Message:
-----------
Format code
Commit: 65162ae8e9e87af6293b000d253eb67fe6ae4e9b
https://github.com/Dolibarr/dolibarr/commit/65162ae8e9e87af6293b000d253eb67fe6ae4e9b
Author: Florian HENRY <address@hidden>
Date: 2016-02-01 (Mon, 01 Feb 2016)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/class/html.formventilation.class.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/supplier/index.php
Log Message:
-----------
Accountancy modules
Commit: 48b191b1fffe464b76360a6738986d414f59d061
https://github.com/Dolibarr/dolibarr/commit/48b191b1fffe464b76360a6738986d414f59d061
Author: Florian HENRY <address@hidden>
Date: 2016-02-01 (Mon, 01 Feb 2016)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/class/bookkeeping.class.php
Log Message:
-----------
Fix tuff into accountancy
Commit: 564594c3d70e2a53573a520c5beaee89f619bc13
https://github.com/Dolibarr/dolibarr/commit/564594c3d70e2a53573a520c5beaee89f619bc13
Author: Florian HENRY <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
Log Message:
-----------
Fix accountancy
Commit: 22ce2872ac9caa45680172a9fdfd3ab240a54786
https://github.com/Dolibarr/dolibarr/commit/22ce2872ac9caa45680172a9fdfd3ab240a54786
Author: Florian HENRY <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Fix journal
Commit: 2887eb8c707cde2b7c9204830e437d124a32ef9f
https://github.com/Dolibarr/dolibarr/commit/2887eb8c707cde2b7c9204830e437d124a32ef9f
Author: Florian HENRY <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
fix accountancy
Commit: c1f084b448fbfed8acaffc0c91b74728e479b098
https://github.com/Dolibarr/dolibarr/commit/c1f084b448fbfed8acaffc0c91b74728e479b098
Author: Florian HENRY <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M htdocs/accountancy/journal/purchasesjournal.php
Log Message:
-----------
Fix accountancy
Commit: 015f24e80abff9c2a44895b9825023d504cf470e
https://github.com/Dolibarr/dolibarr/commit/015f24e80abff9c2a44895b9825023d504cf470e
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Fix php unit to work both with old and new setup
Commit: 43d165f985b06e3db1df4c91f389a787b31f5de9
https://github.com/Dolibarr/dolibarr/commit/43d165f985b06e3db1df4c91f389a787b31f5de9
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Commit: 687afeaffe99771221c7f155cc0e39ff407ef355
https://github.com/Dolibarr/dolibarr/commit/687afeaffe99771221c7f155cc0e39ff407ef355
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M htdocs/expensereport/card.php
Log Message:
-----------
FIX No project fields if module disabled
Commit: 43ac8b72a3d52e2d4700eaeb3ff7cc217947a711
https://github.com/Dolibarr/dolibarr/commit/43ac8b72a3d52e2d4700eaeb3ff7cc217947a711
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M htdocs/core/class/menu.class.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
Log Message:
-----------
Merge pull request #4542 from aspangaro/3.9-p9
New accountancy menu for auguria
Commit: 325c35d3553e97c9a7fb71a9ead43427d527de42
https://github.com/Dolibarr/dolibarr/commit/325c35d3553e97c9a7fb71a9ead43427d527de42
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M htdocs/core/class/menu.class.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 1548be26149f53e77cddeca05f0e6cf7ad0cf88d
https://github.com/Dolibarr/dolibarr/commit/1548be26149f53e77cddeca05f0e6cf7ad0cf88d
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-02 (Tue, 02 Feb 2016)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/fiscalyear.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/admin/fiscalyear_info.php
M htdocs/accountancy/admin/importaccounts.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/admin/journal.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/balancebymonth.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyyear.php
M htdocs/accountancy/class/accountancysystem.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/class/html.formventilation.class.php
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/index.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/index.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
M htdocs/accountancy/tpl/export_journal.tpl.php
Log Message:
-----------
Merge pull request #4549 from FHenry/3.9
Accountancy module
Commit: bbf15d6a5d4851a19d7ea45eabc8e643596af964
https://github.com/Dolibarr/dolibarr/commit/bbf15d6a5d4851a19d7ea45eabc8e643596af964
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
FIX #4498
Commit: ee4b437bff3924586895194d748b4b27cc2d40ee
https://github.com/Dolibarr/dolibarr/commit/ee4b437bff3924586895194d748b4b27cc2d40ee
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/fiscalyear.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/admin/fiscalyear_info.php
M htdocs/accountancy/admin/importaccounts.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/admin/journal.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/balancebymonth.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyyear.php
M htdocs/accountancy/class/accountancysystem.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/class/html.formventilation.class.php
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/index.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/index.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
M htdocs/accountancy/tpl/export_journal.tpl.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 229199aaadb4c5f6b50b363483fed14883366f38
https://github.com/Dolibarr/dolibarr/commit/229199aaadb4c5f6b50b363483fed14883366f38
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
FIX #4497
Commit: 165771b6521127621aee79d3ca1edea5397df5fe
https://github.com/Dolibarr/dolibarr/commit/165771b6521127621aee79d3ca1edea5397df5fe
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
FIX #4439
Commit: d85f7be1f513bda1e59e375183074af2f49c45e6
https://github.com/Dolibarr/dolibarr/commit/d85f7be1f513bda1e59e375183074af2f49c45e6
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M ChangeLog
M htdocs/contact/card.php
Log Message:
-----------
FIX #4423
Commit: 6f1ddd3ba40a7bb524d581b1ea044702af9b6d33
https://github.com/Dolibarr/dolibarr/commit/6f1ddd3ba40a7bb524d581b1ea044702af9b6d33
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/compta/paiement/card.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/paiement/list.php
Log Message:
-----------
Fix on ref not correctly initialized.
Commit: f4d04b8f2656343d94e49ac116205428393843e8
https://github.com/Dolibarr/dolibarr/commit/f4d04b8f2656343d94e49ac116205428393843e8
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
Log Message:
-----------
FIX part of #4227
Commit: 19300a2d82e0621b8b3319119ab0731e22203c0b
https://github.com/Dolibarr/dolibarr/commit/19300a2d82e0621b8b3319119ab0731e22203c0b
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/admin/barcode.php
M htdocs/core/lib/functions.lib.php
M htdocs/main.inc.php
Log Message:
-----------
Fix warning when javascript disabled
Commit: 47e2e33fb732b1464b2b663350b5d0e3db459ac6
https://github.com/Dolibarr/dolibarr/commit/47e2e33fb732b1464b2b663350b5d0e3db459ac6
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M ChangeLog
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/admin/barcode.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/paiement/card.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/paiement/list.php
M htdocs/contact/card.php
M htdocs/core/class/menu.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/expensereport/card.php
M htdocs/main.inc.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
Compare:
https://github.com/Dolibarr/dolibarr/compare/6fcf2fb35a17...47e2e33fb732