Florian HENRY
|
26551909a9
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta
|
2021-07-30 20:27:29 +02:00 |
|
Laurent Destailleur
|
463fadb776
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/core/class/html.form.class.php
|
2021-07-08 23:45:26 +02:00 |
|
Alexandre SPANGARO
|
d6be380816
|
FIX Accountancy - constant ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY
|
2021-07-08 21:58:54 +02:00 |
|
Alexandre SPANGARO
|
cd215cda17
|
FIX Accountancy - if we define a date start, automatic binding try to solve old binding
|
2021-07-08 21:49:53 +02:00 |
|
Alexandre SPANGARO
|
7f0d2b009e
|
FIX SQL Error on automatic binding with functionality "company per entity" activated
|
2021-06-16 06:23:50 +02:00 |
|
Alexandre SPANGARO
|
cf723d5120
|
Look a feel v14 CSS Amount
|
2021-06-13 06:37:44 +02:00 |
|
Florian HENRY
|
55761b31c6
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta
|
2021-06-06 22:30:58 +02:00 |
|
Florian HENRY
|
729ca70bf3
|
NEW : rewrite bind accountancy code finding on sales invoice
|
2021-06-04 12:20:52 +02:00 |
|
Laurent Destailleur
|
402d90554a
|
Clean code
|
2021-06-04 10:04:56 +02:00 |
|
Laurent Destailleur
|
2a47128e2d
|
Code comment
|
2021-05-03 11:00:41 +02:00 |
|
Alexandre SPANGARO
|
d95be3e08b
|
Merge remote-tracking branch 'upstream/develop' into 14a39
|
2021-04-26 13:53:16 +02:00 |
|
Laurent Destailleur
|
d0cc64479d
|
Fix protect sql
|
2021-04-24 20:18:11 +02:00 |
|
Alexandre SPANGARO
|
2f31720896
|
Maxi debug of societe/product per entity
|
2021-04-14 04:45:17 +02:00 |
|
Alexandre SPANGARO
|
5723dbb836
|
FIX: Add a sub table to manage accountancy on product/company
|
2021-03-31 04:52:24 +02:00 |
|
Alexandre SPANGARO
|
4e30481fa2
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-30 22:05:03 +02:00 |
|
Laurent Destailleur
|
3744bc6a7a
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 18:17:13 +02:00 |
|
Laurent Destailleur
|
fb84608586
|
Clean sql
|
2021-03-30 03:37:54 +02:00 |
|
Alexandre SPANGARO
|
ea6b22f06e
|
FIX: Add a sub table to manage accountancy on product/company
|
2021-03-30 03:27:46 +02:00 |
|
Alexandre SPANGARO
|
3c70a3d06c
|
Move to _PERENTITY
|
2021-03-27 07:25:31 +01: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
|
00e21caa42
|
NEW: Add a sub table to manage accountancy on product/company
|
2021-03-20 07:42:16 +01:00 |
|
Alexandre SPANGARO
|
18d247026d
|
NEW: Add a sub table to manage product/societe
|
2021-03-18 17:08:55 +01:00 |
|
Frédéric FRANCE
|
337689d5d2
|
code syntax
|
2021-02-22 21:36:42 +01:00 |
|
Alexandre SPANGARO
|
13f985d280
|
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
|
2020-12-04 04:13:42 +01:00 |
|
Laurent Destailleur
|
7dd69a2b2b
|
Fix escape
|
2020-09-19 20:11:04 +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
|
7d3039d41f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
|
2020-06-06 23:04:55 +02:00 |
|
Laurent Destailleur
|
cbafbe16a2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/supplier/index.php
htdocs/admin/mails_templates.php
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/admin.lang
|
2020-06-06 23:00:24 +02:00 |
|
Alexandre SPANGARO
|
e5f8f38fbf
|
FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon
|
2020-06-05 17:24:59 +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 |
|
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
|
880cfd1659
|
FIX #13332 Add more details on screen and help so it is easier to
understand the choices of the computer. Copy code into the automatic
binding to have rule consistent.
|
2020-03-13 18:10:00 +01:00 |
|
Laurent Destailleur
|
bffdc63ec6
|
FIX The "automatic bind" was linked EEC to export accountancy code
Conflicts:
htdocs/accountancy/supplier/index.php
|
2020-01-28 17:48:34 +01:00 |
|
Laurent Destailleur
|
e9de1e16e8
|
FIX The "automatic bind" was linked EEC to export accountancy code
|
2020-01-28 17:44:05 +01:00 |
|
Laurent Destailleur
|
fdf4d86d81
|
Debug code
|
2019-12-16 12:38:51 +01: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 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +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
|
febf9ccd04
|
FIX The Button "Automatic binding" did not use the account intracomm or
export.
|
2019-10-21 05:24:54 +02:00 |
|
Laurent Destailleur
|
6ebd9721da
|
FIX The Button "Automatic binding" did not use the account intracomm or
export.
|
2019-10-21 03:50:57 +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
|
57140b79dc
|
Restore official text of licence
|
2019-06-24 18:30:07 +02:00 |
|
Philippe GRAND
|
40b09f1cf7
|
all http addresses should be https now
|
2019-06-24 09:35:41 +02:00 |
|
Alexandre SPANGARO
|
b8311da262
|
Nowrap on amount
|
2019-06-19 08:56:45 +02:00 |
|
Laurent Destailleur
|
f41606ba15
|
Merge branch '10.0' into 10.0_Differentiated_export
|
2019-06-12 13:27:49 +02:00 |
|
Laurent Destailleur
|
ba2b07917b
|
Fix look and feel v10
|
2019-06-04 02:11:03 +02:00 |
|
Alexandre SPANGARO
|
d4e2fab983
|
Replace term "Advanced accountancy" by Accountancy (Double entries)
|
2019-05-13 22:25:15 +02: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
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Philippe GRAND
|
9ce73dfa71
|
update with html5 compliant code
|
2019-01-21 21:15:53 +01:00 |
|
Philippe Grand
|
13ea2d93dd
|
Update index.php
|
2019-01-16 19:22:29 +01:00 |
|
Philippe GRAND
|
3168c76946
|
update with html5 compliant code
|
2019-01-16 17:39:40 +01:00 |
|
Regis Houssin
|
aaa9a4f47c
|
FIX use getEntity('invoice') instead getEntity('facture')
|
2018-11-15 17:27:49 +01:00 |
|
Frédéric FRANCE
|
aab617aeb3
|
remove deprecated
|
2018-09-09 18:38:48 +02:00 |
|
Philippe GRAND
|
f17275845d
|
standardize
|
2018-07-28 14:29:28 +02:00 |
|
Philippe GRAND
|
e755fde52a
|
clean and update code
|
2018-07-23 17:35:30 +02:00 |
|
Laurent Destailleur
|
ad2df304b4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/fourn/commande/card.php
htdocs/societe/class/societe.class.php
|
2018-06-18 13:31:29 +02:00 |
|
Laurent Destailleur
|
102f9aa84f
|
FIX Problems in accountancy module when using multicompany module.
|
2018-06-18 13:19:46 +02:00 |
|
Frédéric FRANCE
|
d986909109
|
loadlangs
|
2018-05-26 23:52:52 +02:00 |
|
Laurent Destailleur
|
187cc35786
|
Look and feel v8
|
2018-04-14 22:23:56 +02:00 |
|
Laurent Destailleur
|
930512d9a2
|
FIX Add a test to avoid to reset binding by error.
|
2018-03-27 13:08:16 +02:00 |
|
Laurent Destailleur
|
56944115cb
|
Hide a very dangerous feature. Should be useless.
|
2018-03-27 12:46:15 +02:00 |
|
Laurent Destailleur
|
dab8dbd671
|
FIX Binding pages must start on fiscal month not calendar month
|
2018-03-27 12:31:08 +02:00 |
|
Laurent Destailleur
|
88939a8469
|
FIX Draft invoice must be excluded from report
|
2018-03-27 11:10:12 +02:00 |
|
Laurent Destailleur
|
33032a5474
|
Look and feel v6
|
2017-11-29 18:13:22 +01:00 |
|
Alexandre SPANGARO
|
f1b7b36a11
|
Fix : problem on column in customer to bind index
|
2017-10-05 05:38:02 +02:00 |
|
Laurent Destailleur
|
a4665e17d4
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
|
2017-09-12 13:26:25 +02:00 |
|
Laurent Destailleur
|
16092bc9f0
|
Clean code
|
2017-09-12 13:13:57 +02:00 |
|
Laurent Destailleur
|
a6a142753a
|
Fix bad label when account not set
|
2017-09-08 15:24:27 +02:00 |
|
Laurent Destailleur
|
f29a4c1fb1
|
Make accountancy pages responsive
|
2017-09-05 20:42:34 +02:00 |
|
Laurent Destailleur
|
201db3b720
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/projet/tasks/task.php
|
2017-07-14 00:24:49 +02:00 |
|
Laurent Destailleur
|
b186fa8759
|
Fix pgsql compatibility
|
2017-07-01 13:31:44 +02:00 |
|
Alexandre SPANGARO
|
459fac4753
|
Merge remote-tracking branch 'uptream/develop' into 6.0-fec3
# Conflicts:
# htdocs/accountancy/customer/index.php
|
2017-06-22 05:30:21 +02:00 |
|
Alexandre SPANGARO
|
c381c213a5
|
Fix : Accountancy
|
2017-06-20 06:52:41 +02:00 |
|
Laurent Destailleur
|
fcdc7b1a0d
|
Fix pgsql compatibility
|
2017-06-20 01:53:34 +02:00 |
|
Alexandre SPANGARO
|
b240f536b5
|
Fix : Accountancy - Debug and add information in database
|
2017-06-17 07:54:35 +02:00 |
|
Regis Houssin
|
a25facef7c
|
Fix: use 0 instead false
|
2017-06-03 11:49:59 +02:00 |
|
Regis Houssin
|
5c5663c5ae
|
New: getEntity function use true $shared value by default
|
2017-05-30 18:50:54 +02:00 |
|
philippe grand
|
4d31759ff9
|
Update code using new css class
|
2017-04-11 14:35:10 +02:00 |
|
Laurent Destailleur
|
e6cdcfca00
|
Close #6240
|
2017-01-07 16:47:11 +01:00 |
|
Laurent Destailleur
|
8ee838c9c4
|
Minor fixes in accounting module.
|
2017-01-07 16:17:15 +01:00 |
|
Laurent Destailleur
|
ac44aa6d81
|
FIX security bugs
|
2016-12-18 13:24:06 +01:00 |
|
Laurent Destailleur
|
979632fdc8
|
Uniformize code
|
2016-11-17 19:27:29 +01:00 |
|
Laurent Destailleur
|
5816c86e07
|
Debug accountancy module
|
2016-11-17 17:51:10 +01:00 |
|
Laurent Destailleur
|
b73a164256
|
Work on accounting module
|
2016-11-17 16:32:19 +01:00 |
|
Laurent Destailleur
|
cd2a963d80
|
Fix sql syntax error
|
2016-11-15 12:14:34 +01:00 |
|
Laurent Destailleur
|
206970b82c
|
Fix management of multientity
|
2016-11-15 11:42:01 +01:00 |
|
Laurent Destailleur
|
a7c6ecc177
|
Fix better compatibility with multicompany
|
2016-10-14 16:05:25 +02:00 |
|
Laurent Destailleur
|
7c1b74133a
|
Debug accountancy module
|
2016-10-13 22:29:49 +02:00 |
|
Laurent Destailleur
|
539ee1ace2
|
Uniformize code
|
2016-10-06 18:06:40 +02:00 |
|
Laurent Destailleur
|
93c848fcc5
|
Add page index for accountancy module
|
2016-10-06 17:43:10 +02:00 |
|
Laurent Destailleur
|
9ad96c2be3
|
Debug module accountancy expert
|
2016-10-05 20:50:47 +02:00 |
|
Laurent Destailleur
|
1e3038d634
|
Debug reports
|
2016-10-04 13:57:25 +02:00 |
|
Laurent Destailleur
|
aae4524fe2
|
Debug module accountancy
|
2016-09-30 18:38:48 +02:00 |
|
Laurent Destailleur
|
e6503c0d36
|
Better explanation
|
2016-09-29 12:52:28 +02:00 |
|
Laurent Destailleur
|
ccd7100b7f
|
Minor code fix
|
2016-09-29 10:43:53 +02:00 |
|