Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
118,434 Commits 36 Branches 189 Tags
e0da8a2109d6b10366ccb4610394d2bc61e4213f
Commit Graph

520 Commits

Author SHA1 Message Date
Laurent Destailleur
2af8b7078c Fix turnover calculation was wrong. We must include only 2021-03-31 19:50:43 +02:00
Alexandre SPANGARO
38d47c184e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 22:12:57 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Alexandre SPANGARO
22f809c517 Move to _PERENTITY 2021-03-27 05:23:20 +01:00
stickler-ci
5af4b4673c Fixing style errors. 2021-03-21 22:12:36 +00:00
Alexandre SPANGARO
17d3b85ec4 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42 NEW: Add a sub table to manage accountancy on product/company 2021-03-20 07:42:16 +01:00
Laurent Destailleur
9a5d1acc1d Merge pull request #16769 from frederic34/patch-4 
fix php8 warning
 2021-03-18 23:20:43 +01:00
Laurent Destailleur
99f95741d1 Merge pull request #16781 from frederic34/patch-12 
fix php8 warning
 2021-03-18 23:09:22 +01:00
Alexandre SPANGARO
18d247026d NEW: Add a sub table to manage product/societe 2021-03-18 17:08:55 +01:00
Laurent Destailleur
46972ec669 FIx #5660 2021-03-18 14:34:44 +01:00
Frédéric FRANCE
f9e1624a78 fix php8 warning 2021-03-17 22:41:18 +01:00
Frédéric FRANCE
340f67fce8 fix php8 warning 2021-03-17 18:23:44 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Gauthier PC portable 024
4f767c0823 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a FIX : correction of payment salaries list on employee tab of user card 2021-02-23 15:08:27 +01:00
Frédéric FRANCE
337689d5d2 code syntax 2021-02-22 21:36:42 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Frédéric FRANCE
5820758968 fix class name Tva 2021-01-23 20:59:23 +01:00
Alexandre SPANGARO
5d6ca5c636 FIX: Accountancy - Add translation when journal label data is record 2021-01-12 05:52:47 +01:00
Laurent Destailleur
995afd59f2 Merge pull request #15672 from frederic34/patch-8 
fix trans replace html
 2020-12-07 22:35:01 +01:00
stickler-ci
3fc4fb79e0 Fixing style errors. 2020-12-05 17:20:28 +00:00
Frédéric FRANCE
90a5c90a5a fix trans removeing html 2020-12-05 18:19:33 +01:00
Frédéric FRANCE
18319f4fd3 fix trans replace html 2020-12-05 18:05:09 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
e7775d2f79 Fix scrutinizer errors 2020-11-30 12:54:47 +01:00
Laurent Destailleur
077821da82 Merge pull request #15342 from grandoc/new_branch_10_11_2020 
fix : display vat_tx instead of Array text
 2020-11-10 14:38:00 +01:00
Laurent Destailleur
ecaf732881 Update sellsjournal.php 2020-11-10 14:37:33 +01:00
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