lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,103 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-2
Commit Graph

441 Commits

Author SHA1 Message Date
Laurent Destailleur
bebdf12f8c
Update purchasesjournal.php 2020-11-10 14:37:00 +01:00
Philippe GRAND
51141883d4 fix : display vat_tx instead of Array% 2020-11-10 11:42:07 +01:00
Laurent Destailleur
47b3b30aaa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/fourn/product/list.php
	htdocs/product/fournisseurs.php
	htdocs/societe/card.php
 2020-11-10 11:10:35 +01:00
Philippe GRAND
dc0b610fd5 fix : display vat_tx instead of Array text 2020-11-10 11:07:10 +01:00
Laurent Destailleur
73df033000 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/boxes/box_birthdays.php
 2020-11-10 11:05:53 +01:00
Laurent Destailleur
4a5c7d299f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-11-09 19:47:25 +01:00
Alexandre SPANGARO
0a078da8e4 FIX: Accountancy - Some ajustments on length of the account 2020-11-09 14:59:29 +01:00
Alexandre SPANGARO
617c930574 FIX: Accountancy - Some ajustments on length of the account (general & auxiliary) 2020-11-09 14:13:09 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
294688891d CSS 2020-10-07 01:10:26 +02:00
Alexandre SPANGARO
ed26f07783 FIX If salaries subledger account not defined, put only in the general account 2020-09-30 06:46:23 +02:00
Alexandre SPANGARO
d50932499f Fix select date on periodicity by default 2020-09-28 07:03:22 +02:00
Alexandre SPANGARO
8c75f0b95b Code optimize 2020-09-07 21:38:39 +02:00
stickler-ci
028275582a Fixing style errors. 2020-09-01 14:26:16 +00:00
Alexandre SPANGARO
0336fe5686 NEW Accountancy - On transfers, select the periodicity by default 2020-09-01 16:18:07 +02:00
Alexandre SPANGARO
498431fa6f NEW Add a start date to begin binding in accountancy 2020-08-17 15:27:05 +02:00
Laurent Destailleur
42234ba506 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
 2020-07-24 00:07:57 +02:00
Laurent Destailleur
f07a1a6d1e FIX for #14253 2020-07-18 18:54:55 +02:00
Laurent Destailleur
6ad8145645 FIX for #14253 2020-07-18 18:52:33 +02:00
Laurent Destailleur
2dc1008663 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 05:21:40 +02:00
Laurent Destailleur
c3375b176d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2020-07-10 05:21:01 +02:00
Laurent Destailleur
071b909d38 FIX Fails to retraive accounting code of social contribution sometimes 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2020-07-10 05:19:21 +02:00
Laurent Destailleur
79a6246666 FIX Fails to retraive accounting code of social contribution sometimes 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2020-07-10 05:18:46 +02:00
Laurent Destailleur
86744a2e0c FIX Fails to retraive accounting code of social contribution sometimes 2020-07-10 05:14:54 +02:00
Laurent Destailleur
17ebdd73fe FIX Fails to retraive accounting code of social contribution sometimes 2020-07-10 05:13:24 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
43dcd9beb5
add new rule 2020-05-21 00:02:33 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
c9f242406c Look and feel v12 2020-04-25 02:44:24 +02:00
Laurent Destailleur
f7d4d78008 Fix error 500 2020-04-23 17:55:55 +02:00
Laurent Destailleur
cd1368cb71 Fix dispatch in ledger for various payment done in same account when 
there is 2 different transaction in 2 different account (backport v12)
 2020-04-23 17:10:40 +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
0855598c00 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/lib/functions.lib.php
 2020-02-29 12:51:33 +01:00
Laurent Destailleur
c3ab1055bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-29 12:48:40 +01:00
Laurent Destailleur
52a92924de
Merge pull request #13230 from atm-gauthier/fix_round_accountancy 
FIX : round MT in accountancy books
 2020-02-29 12:35:33 +01:00
gauthier
284a4189b3 FIX : round MT in accountancy books 2020-02-28 14:32:35 +01:00
Laurent Destailleur
3faed758b3 FIX #13110 2020-02-14 19:05:39 +01:00
Laurent Destailleur
ccced09113 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/propal/list.php
	htdocs/core/class/html.formmail.class.php
 2020-02-12 22:54:55 +01:00
Laurent Destailleur
50f0b61f1e
Update bankjournal.php 2020-02-12 18:50:33 +01:00
Pierre Ardoin
c7181830fc
Fix the display of the banner with multicompany 
Before : if a account of a entity require to define the Journal code, Banner displayed in all entities.

Now : Show the banner only in the entity concerned.
 2020-02-12 09:11:39 +01:00
Laurent Destailleur
675ce3b32f Fix sql error on update of subledger account on a various payment 
Fix warning message that was not accurate
 2020-01-10 02:20:08 +01:00
Laurent Destailleur
5d7a1f1265 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/en_US/stocks.lang
 2019-11-19 19:02:14 +01:00
Alexandre SPANGARO
3937b45c5f Core - Fix accountancy write social contribution in bookkeeping (Need for FEC format) 2019-11-16 07:51:38 +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
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +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
360bf55f5b
clean indent 2019-10-20 01:09:11 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
7960c91955 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/theme/md/style.css.php
 2019-10-16 17:27:41 +02:00
Alexandre SPANGARO
4bb1677079 Fix - Accountancy - Various payment - Subledger is not recovered in bank journal 2019-10-16 10:39:35 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
3be635a9bc Fix bad var name 2019-08-31 02:41:40 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
cf00ae971a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-15 22:45:29 +02:00
Laurent Destailleur
5778a02ee1 FIX #11505 2019-07-15 18:44:33 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
9b32763919 Fix label for report n ledger for transitionnal bank account on tranfer 2019-07-05 15:25:29 +02:00
Laurent Destailleur
57140b79dc Restore official text of licence 2019-06-24 18:30:07 +02:00
Philippe GRAND
b731edef16 all http addresses should be https now 2019-06-24 09:37:05 +02:00
Laurent Destailleur
d47cf87c00 Look and feel v10 2019-06-20 17:59:28 +02:00
Laurent Destailleur
c521b9b8f8 Fix dispatch in ledger table of withdraw / direct debit payment 2019-06-20 16:58:51 +02:00
Laurent Destailleur
afb6362317 Fix look and feel v10 
Fix link to direct debit payment order
 2019-06-20 13:37:06 +02:00
Laurent Destailleur
bff6260983 Fix syntax error 2019-06-20 12:34:29 +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
f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-06-13 12:15:51 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
1e87635e8e
Update sellsjournal.php 2019-06-12 13:02:59 +02:00
Laurent Destailleur
eefd30fe1c
Update purchasesjournal.php 2019-06-12 13:01:04 +02:00
Laurent Destailleur
42915d86ec
Update expensereportsjournal.php 2019-06-12 12:57:02 +02:00
Laurent Destailleur
a400183bf1
Update bankjournal.php 2019-06-12 12:52:51 +02:00
Laurent Destailleur
f435f4bd6a
Update bankjournal.php 2019-06-12 12:49:44 +02:00
Laurent Destailleur
402cbba4ad
Update bankjournal.php 2019-06-12 12:48:21 +02:00
Laurent Destailleur
0f3db439fe
Update bankjournal.php 2019-06-12 12:38:01 +02:00
Alexandre SPANGARO
f3cba86282 Better look 2019-06-10 07:49:10 +02:00
Laurent Destailleur
29d9983669 Fix look and feel v10 2019-06-04 01:22:26 +02:00
Alexandre SPANGARO
d4e2fab983 Replace term "Advanced accountancy" by Accountancy (Double entries) 2019-05-13 22:25:15 +02:00
Frédéric FRANCE
a836c75d70
replace html by html5 in accountancy 2019-03-03 10:31:46 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Maxime Kohlhaas
da361f0ea5 Fix wrong column name in purchase journal 2019-02-08 12:24:07 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop 
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
 2019-02-03 19:11:07 +01:00
Laurent Destailleur
afd53a99c2 Fix merge 2019-02-03 18:21:03 +01:00
Laurent Destailleur
e309261140 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-03 18:19:58 +01:00
Laurent Destailleur
456e78b7cf FIX #10485 2019-02-03 17:45:31 +01:00
Frédéric FRANCE
03701fa091
psr2 2019-02-02 18:25:01 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
a10203bfad
Merge pull request #10378 from rycks/exportJournaux 
Export journaux
 2019-01-26 13:51:41 +01:00
Philippe GRAND
1741e77996 update with html5 compliant code 2019-01-21 21:19:42 +01:00
Eric
fdb1e1145c add if ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL 2019-01-20 20:58:52 +01:00
Eric
71f7aa9503 use transnoentitiesnoconv instead of html_entity_decode 2019-01-20 20:55:59 +01:00
Eric
88efc830fe re enable export for expensereportsjournal 2019-01-20 15:25:53 +01:00