Commit Graph

442 Commits

Author SHA1 Message Date
Laurent Destailleur
e5fa5be0e5
Merge pull request #13861 from aspangaro/12.0_a26
NEW Bookkeeping by account - Look & feel v12
2020-05-12 03:02:32 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Alexandre SPANGARO
04480847df NEW Accountancy balance - Add a button ShowSubtotalByGroup 2020-05-10 08:28:03 +02:00
stickler-ci
ff578198d6 Fixing style errors. 2020-05-10 04:35:52 +00:00
Alexandre SPANGARO
f40e978475 Fix delbookkeepingyear - add hook printFieldPreListTitle - Look & Feel v12 2020-05-10 06:28:50 +02:00
Alexandre SPANGARO
40ffbbe616 Debug 2020-05-08 13:28:56 +02:00
Alexandre SPANGARO
a49635a825 NEW Bookkeeping by account - Add selectfields & hook 2020-05-08 07:45:01 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Laurent Destailleur
042fb4641f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
2020-04-21 18:33:11 +02:00
Laurent Destailleur
f8ae5d9972 Fix Do not show value if null 2020-04-21 12:00:14 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
59f66ce9bd Type of var 2020-03-25 11:32:24 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken()
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Alexandre SPANGARO
bc717bc6ae Work on reconciliation of accouting account 2020-03-15 07:49:24 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Scrutinizer Auto-Fixer
4ab671338b Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-06 13:11:44 +00:00
Alexandre SPANGARO
cdca4ca0aa NEW: Bookkeeping - Add link to document & pdf 2020-03-02 09:01:25 +01:00
Alexandre SPANGARO
be8ed42450 NEW: Bookkeeping - Add link to document & pdf 2020-03-01 23:17:40 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
a312adf2b0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
2020-02-14 19:57:31 +01:00
Laurent Destailleur
d3d572c8d3 FIX Avoid to download the export if we just press enter to refresh form 2020-02-14 19:55:50 +01:00
Laurent Destailleur
a7df72ee6f FIX #13067 2020-02-14 19:34:26 +01:00
Muhammad Aboelfotoh
ce6cf04028 Add new view for balance.php that additionally shows opening balance 2020-02-13 13:53:07 +00:00
oscim
ed68ae0574
Update thirdparty_lettering_supplier.php
fix form in fiscalyear lasted validated
2020-01-31 08:50:41 +01:00
Alexandre SPANGARO
074e55fca5 NEW: Accountancy - General ledger - Add an option to search not reconciled line 2020-01-28 22:56:26 +01:00
Alexandre SPANGARO
d5ff006171 NEW: Accountancy - General ledger - Add an option to search not lettering line 2020-01-27 05:20:48 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
5c8733a84b More complete message 2019-12-16 19:30:18 +01:00
Laurent Destailleur
d22cd5c321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/accountancy/bookkeeping/list.php
2019-12-16 19:09:53 +01:00
Laurent Destailleur
65abe7532c Fix error message not reported when deleting record in ledger. 2019-12-16 19:05:32 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
66805a502a
doxygen 2019-12-11 22:53:57 +01:00
Philippe GRAND
9996c1ca7a fix : invoid sql injection 2019-11-21 09:49:53 +01:00
Philippe GRAND
54d67de538 fix : invoid sql injection 2019-11-21 09:44:13 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Frédéric FRANCE
d059df1348
Update thirdparty_lettering_supplier.php 2019-11-04 22:51:15 +01:00
Frédéric FRANCE
5113e5e570
fix missing newtoken 2019-11-04 22:50:19 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
75a47eebe0 Fix Method fetchAll must NEVER be used for table with more than 1000
record
2019-10-16 16:17:51 +02:00
Laurent Destailleur
a1c93cb2e6 MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
Look and feel v11
2019-10-15 02:45:12 +02:00
Laurent Destailleur
b276abea26 Fix missing token in form
Fix date lost after search
2019-10-11 16:49:58 +02:00
Laurent Destailleur
b41f7274dd
Merge pull request #12085 from aspangaro/11.0_accounting
NEW : Accountancy - List by account - Modify sortfield, nowrap on amo…
2019-10-11 16:39:09 +02:00
Laurent Destailleur
fbc4e3b441
Update listbyaccount.php 2019-10-11 16:37:10 +02:00
Laurent Destailleur
f82f4162c3 NEW Look and fill v11: Introduce CSS "trforbreak" 2019-10-10 22:42:23 +02:00
Alexandre SPANGARO
d43f2bbfae NEW : Accountancy - List by account - Modify sortfield, nowrap on amount and sum of sous-total 2019-10-10 11:44:21 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
2019-09-06 16:10:55 +02:00
Alexandre SPANGARO
14b9460de0 FIX Sens of the balance (Debit - Credit in accountancy not contrary) 2019-08-29 16:27:25 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00
Laurent Destailleur
477384105f FIX missing test on permission on button to delete ledger record 2019-08-18 19:25:36 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
dfc2bebbb6 FIX #11400 2019-08-01 13:27:07 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
2019-07-30 20:55:15 +02:00
Alexandre SPANGARO
a2fc3689da Nowrap on amount 2019-07-28 22:59:43 +02:00
Alexandre SPANGARO
59f8fb77da Travis 2019-06-26 13:59:32 +02:00
Alexandre SPANGARO
c9a36cede6 Update work 2019-06-26 11:13:34 +02:00
Alexandre SPANGARO
a6a0e2bc77 NEW: Accountancy - Add hook bookkeepinglist on general ledger 2019-06-26 10:58:36 +02:00
Laurent Destailleur
229dd4d3f5
Merge branch 'develop' into 10.0_accounting6 2019-06-24 19:59:11 +02:00
Laurent Destailleur
57140b79dc Restore official text of licence 2019-06-24 18:30:07 +02:00
Philippe GRAND
d0a14d5aa7 all http addresses should be https now 2019-06-23 15:41:10 +02:00
Laurent Destailleur
d47cf87c00 Look and feel v10 2019-06-20 17:59:28 +02:00
Laurent Destailleur
6b5d477476 Fix search criteria lost after a delete 2019-06-20 17:14:04 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Laurent Destailleur
c0949e3cf9
Merge pull request #11175 from aspangaro/10.0_Differentiated_export
NEW Accountancy - Differentiated export
2019-06-12 15:42:20 +02:00
Laurent Destailleur
44f383c8b9 Fix data lost when creation in error 2019-06-12 13:57:34 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
cb859b7dfb Look and feel v10 2019-06-04 01:30:17 +02:00
Alexandre SPANGARO
34a91ef96f Apply button reexport on view list 2019-05-23 11:21:41 +02:00
Alexandre SPANGARO
2085958a69 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-23 11:10:07 +02:00
Alexandre SPANGARO
4ba8cf0641 Fix 2019-05-23 11:08:06 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
Alexandre SPANGARO
d9e9cb2ea9 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-20 15:02:05 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
Alexandre SPANGARO
7c9ccee64d NEW Accountancy - Differentiated export 2019-05-14 05:45:36 +02:00
Alexandre SPANGARO
d4e2fab983 Replace term "Advanced accountancy" by Accountancy (Double entries) 2019-05-13 22:25:15 +02:00
John BOTELLA
b0e780fab0 Fix travis 2019-05-13 09:39:45 +02:00
John BOTELLA
f296093f8d fix travis 2019-05-10 15:52:46 +02:00
Laurent Destailleur
bb4cda6719 Fix phpcs 2019-05-08 19:08:40 +02:00
Laurent Destailleur
590b1d1e90 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2019-05-08 18:24:50 +02:00
Alexandre SPANGARO
99b068b625 FIX sortfield on lettering function 2019-05-05 21:46:56 +02:00
Frédéric FRANCE
0c5d9de13f
Update thirdparty_lettering_supplier.php 2019-05-04 10:38:49 +02:00
Frédéric FRANCE
c595a591a2
Update thirdparty_lettering_customer.php 2019-05-04 10:37:29 +02:00
Frédéric FRANCE
fc520810b7
Update thirdparty_lettering_customer.php 2019-05-04 10:17:04 +02:00