Laurent Destailleur
091fbb2824
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 11:55:06 +02:00
Laurent Destailleur
1e9ae1bc02
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-07-06 11:32:04 +02:00
Laurent Destailleur
053a1a2230
Fix duplicate code
2020-07-06 11:22:30 +02:00
DEMAREST Maxime (Indelog)
7bf037ab2f
Fix blank line at end of control structure
2020-05-06 13:46:24 +02:00
DEMAREST Maxime (Indelog)
bf8cd51a5a
Fix somes code formating errors
2020-05-06 13:37:24 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78
Add include various payments and loans in accounting report
...
For simplified accouning, behaviour not enable by default and must be
enabed in simplified accounting module admin page (or by global
settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
ACCOUNTING_REPORTS_INCLUDE_LOAN).
2020-05-06 12:58:41 +02:00
Laurent Destailleur
6b114a31ce
Look and feel v12
2020-04-25 03:00:41 +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
146ead4d04
Code comment
2020-04-08 11:39:22 +02:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16
...
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +01:00
Alexandre SPANGARO
86d9622360
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 10:44:04 +01:00
Laurent Destailleur
114e41108d
FIX sort link
2020-02-26 06:43:58 +01:00
Laurent Destailleur
c38e88ca46
FIX Bad sort link in accounting report
2020-02-26 06:43:52 +01:00
Laurent Destailleur
4831d22354
FIX sort link
2020-02-26 06:43:21 +01:00
Laurent Destailleur
6cf6719cfb
FIX Bad sort link in accounting report
2020-02-26 06:39:02 +01:00
oscim
d224c711cf
Update result.php
...
fix error for display detail of account 6xxx. this account is < 0, but is not null
2020-01-29 11:07:30 +01:00
oscim
862da5b646
Update result.php
...
fix error for display detail of account 6xxx. this account is < 0, but is not null
2020-01-29 08:08:15 +01:00
Scrutinizer Auto-Fixer
455178ff73
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Regis Houssin
a527e72124
FIX #12688
2019-12-12 16:35:07 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo
2019-12-11 19:11:13 +01:00
Scrutinizer Auto-Fixer
df664e790b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 23:15:34 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Laurent Destailleur
2d9135b6ad
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/card.php
htdocs/holiday/list.php
2019-11-01 21:06:06 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Laurent Destailleur
8849cd9897
Update index.php
2019-10-30 02:19:32 +01:00
Alexandre SPANGARO
db86dff7d1
Fix sign for VAT repaid in report
2019-10-29 17:10:10 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory
2019-10-26 18:13:20 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +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
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Alexandre SPANGARO
9a32117b1d
Nowrap on amount
2019-06-19 08:43:57 +02:00
Laurent Destailleur
bcf0dd0168
Merge branch 'develop' into patch-5
2019-03-14 16:47:08 +01:00
Laurent Destailleur
cdf6e4b65a
Fix some PSR rules
2019-03-14 16:43:27 +01:00
Frédéric FRANCE
321a919fb1
Update result.php
2019-03-14 16:42:35 +01:00
florian HENRY
53a76e91b4
fix missing test on method result
2019-03-11 21:25:51 +01:00
Laurent Destailleur
cdf85b0d00
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-23 16:02:35 +01:00
Laurent Destailleur
9ba6e3f8f5
FIX #10638
2019-02-23 15:57:57 +01:00
Cristian Torres
8ca6935f8b
[FIX] Variable $i is already declared
...
It was preventing displaying of the other accounts
2019-02-23 14:08:11 +01:00
Cristian Torres
7128270a95
[FIX] Variable $i is already declared
...
It was preventing displaying of the other accounts
2019-02-19 11:37:46 -06:00
Philippe GRAND
e10d1eb365
update with html5 compliant code
2019-02-12 14:44:25 +01:00
Philippe Grand
d589ba4847
Update clientfourn.php
...
fixed...
2019-02-10 19:13:11 +01:00
Philippe GRAND
0911631b47
update with html5 compliant code
2019-02-10 16:31:34 +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
