Laurent Destailleur
|
fbce09f21b
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/compta/facture/card.php
htdocs/reception/card.php
|
2021-12-19 00:36:22 +01:00 |
|
Laurent Destailleur
|
d92535ec59
|
FIX Debug transfert in accountancy for expense report
|
2021-12-16 15:41:23 +01:00 |
|
Laurent Destailleur
|
582caf0e7a
|
FIX message for automatic binding not clear of what was done or not
|
2021-12-13 19:04:25 +01:00 |
|
Christian Foellmann
|
6608f5f0d8
|
update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
|
2021-11-29 15:09:18 +01:00 |
|
Laurent Destailleur
|
f484fc2710
|
NEW On the summary of lines to link, can zoom on month.
|
2021-11-22 05:21:24 +01:00 |
|
Laurent Destailleur
|
2975d47113
|
FIX Debug a lot of regression in accountancy transfer
|
2021-11-22 04:13:16 +01:00 |
|
Laurent Destailleur
|
290a6c3d58
|
Prepare code to allow to filter autolink on month/year
|
2021-11-22 03:34:50 +01:00 |
|
Laurent Destailleur
|
a1c1999d7d
|
Fix param on link to automatically bind transaction on product account
|
2021-11-22 03:22:15 +01:00 |
|
Florian HENRY
|
0e8e8a79dc
|
review code
|
2021-11-18 21:12:43 +01:00 |
|
Florian HENRY
|
e4803dda88
|
ZENDSI: fix margin calc with credit note
|
2021-11-16 17:46:12 +01:00 |
|
Florian HENRY
|
8bb7f9c8fb
|
ZENDSI: fix margin calc with credit note
|
2021-11-16 17:44:18 +01:00 |
|
Florian HENRY
|
7380f5901b
|
ZENDSI: fix margin calc with credit note
|
2021-11-16 17:41:38 +01:00 |
|
Gauthier PC portable 024
|
dd23057516
|
NEW : accountancy massaction preselect account (customer and supplier list)
|
2021-11-15 14:54:09 +01:00 |
|
Laurent Destailleur
|
67d69e5cd6
|
Fix autocheck if vat rate seems wrong
|
2021-11-15 09:14:58 +01:00 |
|
Laurent Destailleur
|
2857619316
|
Clean code
|
2021-11-14 19:33:54 +01:00 |
|
Laurent Destailleur
|
e29ef08ee7
|
Fix regression in default set of accounting accounts
|
2021-11-14 19:10:06 +01:00 |
|
Laurent Destailleur
|
8954f7415b
|
Fix warning on vat possible anomaly.
|
2021-11-14 18:40:25 +01:00 |
|
Laurent Destailleur
|
9fd5727985
|
Try to fix some regressions
|
2021-11-07 18:47:27 +01:00 |
|
Laurent Destailleur
|
dd2207d6c5
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/db/DoliDB.class.php
htdocs/resource/list.php
|
2021-11-06 21:11:05 +01:00 |
|
Philippe GRAND
|
ce75806728
|
fix scrutinizer : The property datef does not exist on Facture
|
2021-10-23 11:46:54 +02:00 |
|
Laurent Destailleur
|
81f2a21954
|
Merge pull request #18942 from aspangaro/15a25
NEW Accountancy - rewrite bind accountancy code finding on purchase invoice
|
2021-10-22 22:56:24 +02:00 |
|
Frédéric FRANCE
|
46c4f28478
|
fix multiple warnings
|
2021-10-22 22:15:59 +02:00 |
|
Alexandre SPANGARO
|
40a23e4aa4
|
Update work, thanks Florian
|
2021-10-22 17:12:44 +02:00 |
|
Alexandre SPANGARO
|
0cbfdb4219
|
Merge remote-tracking branch 'upstream/develop' into 15a25
|
2021-10-22 16:49:47 +02:00 |
|
Florian HENRY
|
0589c9c3ca
|
fix: scrutinizer
|
2021-10-21 15:55:11 +02:00 |
|
Florian HENRY
|
f783dd56a4
|
fix: scrutinizer
|
2021-10-21 15:54:23 +02:00 |
|
Alexandre SPANGARO
|
9e3a00521d
|
FIX also on customer index for automatic binding
|
2021-10-13 21:36:04 +02:00 |
|
Alexandre SPANGARO
|
5d7587259d
|
FIX Accountancy - If deposit invoice is used, force binding in deposit accounting account to solve transaction
|
2021-10-13 21:21:16 +02:00 |
|
Laurent Destailleur
|
34f2b2b68d
|
Merge branch 'develop' into 15a25
|
2021-10-12 12:50:30 +02:00 |
|
Laurent Destailleur
|
6168e844bd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2021-10-12 01:43:20 +02:00 |
|
Laurent Destailleur
|
ed3b267d8f
|
Fix css
|
2021-10-12 01:40:30 +02:00 |
|
Alexandre SPANGARO
|
af8e8077b1
|
Uniformize
|
2021-10-11 12:50:16 +02:00 |
|
Alexandre SPANGARO
|
c7fd9328cd
|
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
|
2021-10-08 06:29:22 +02:00 |
|
Alexandre SPANGARO
|
e68d9dc73c
|
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
|
2021-10-07 22:02:56 +02:00 |
|
Florian HENRY
|
d565f9d3f1
|
reveiw code
|
2021-09-28 15:09:47 +02:00 |
|
Florian HENRY
|
f47a319c15
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta
|
2021-09-28 15:01:14 +02:00 |
|
Laurent Destailleur
|
d38c3028eb
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/class/expensereport.class.php
|
2021-09-23 02:41:53 +02:00 |
|
Laurent Destailleur
|
a7ccbb4d9a
|
css
|
2021-09-21 15:40:42 +02:00 |
|
Laurent Destailleur
|
841c4da0f8
|
Fix css
|
2021-09-21 15:39:05 +02:00 |
|
Laurent Destailleur
|
fcffcf3858
|
Remove useless css
|
2021-09-10 18:54:42 +02:00 |
|
Laurent Destailleur
|
649c618370
|
CSS
|
2021-09-10 17:58:41 +02:00 |
|
Laurent Destailleur
|
75cd63a29b
|
Fix css and missing test
|
2021-09-10 17:39:58 +02:00 |
|
Laurent Destailleur
|
32da715a6c
|
Fix css and missing test
|
2021-09-10 17:39:08 +02:00 |
|
Florian HENRY
|
865c5d19bf
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta
|
2021-09-10 15:51:36 +02:00 |
|
Laurent Destailleur
|
46d993c9a6
|
Clean code
|
2021-08-27 22:42:04 +02:00 |
|
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 |
|
Laurent Destailleur
|
b6a538f439
|
Merge pull request #18056 from aspangaro/14b16
FIX Accountancy - Clean virtual zero on the import
|
2021-06-30 14:44:12 +02:00 |
|
Laurent Destailleur
|
c74060d02c
|
Fix lost change in merge
|
2021-06-29 19:24:46 +02:00 |
|
Laurent Destailleur
|
d59dfcb08a
|
Update list.php
|
2021-06-29 19:21:35 +02:00 |
|
Alexandre SPANGARO
|
52b8044517
|
FIX Accountancy - Suggested account of product not concerned by account of thirdparty
|
2021-06-29 04:25:32 +02:00 |
|
Alexandre SPANGARO
|
26c5875f97
|
Uniformize accounting dyiplays
|
2021-06-22 14:20:08 +02:00 |
|
Laurent Destailleur
|
f850f058fa
|
Look and feel v14
|
2021-06-16 21:06:55 +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 |
|
Florian HENRY
|
2fdc6d9461
|
NEW : rewrite bind accountancy code finding on customer invoice
|
2021-06-04 11:35:12 +02:00 |
|
Laurent Destailleur
|
402d90554a
|
Clean code
|
2021-06-04 10:04:56 +02:00 |
|
Laurent Destailleur
|
aa05788d62
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/compta/bank/class/account.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/security.lib.php
htdocs/core/modules/societe/mod_codeclient_elephant.php
htdocs/filefunc.inc.php
test/phpunit/CodingPhpTest.php
|
2021-05-11 20:34:46 +02:00 |
|
ksar
|
107374748e
|
FIX #13955
|
2021-05-10 15:42:24 +02:00 |
|
Laurent Destailleur
|
a806a18455
|
Reduce sql
|
2021-05-03 13:35:10 +02:00 |
|
Laurent Destailleur
|
097ccdab9f
|
Merge pull request #17454 from aspangaro/14a30
NEW Accountancy - Add select date from/to in binding page
|
2021-05-03 13:19:12 +02:00 |
|
Laurent Destailleur
|
2a47128e2d
|
Code comment
|
2021-05-03 11:00:41 +02:00 |
|
Alexandre SPANGARO
|
3c01eba11a
|
NEW Accountancy - Add select date from/to in already bind customer list
|
2021-05-02 01:53:49 +02:00 |
|
Alexandre SPANGARO
|
0acbd87a53
|
NEW Accountancy - Add select date from/to in binding customer list
|
2021-05-02 01:47:29 +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
|
d27030df3f
|
Merge remote-tracking branch 'upstream/develop' into 14a39
|
2021-04-20 04:43:14 +02:00 |
|
Anthony Berton
|
a612831e28
|
next_change
|
2021-04-14 14:45:55 +02:00 |
|
Alexandre SPANGARO
|
2f31720896
|
Maxi debug of societe/product per entity
|
2021-04-14 04:45:17 +02:00 |
|
Laurent Destailleur
|
fa231d85c9
|
Fix sql
|
2021-04-11 13:48:49 +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
|
38d47c184e
|
FIX: Add a sub table to manage accountancy on product/company
|
2021-03-30 22:12:57 +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 |
|
Alexandre SPANGARO
|
6422b0a6c0
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-27 05:02:55 +01:00 |
|
Laurent Destailleur
|
b275789223
|
Fix regression
|
2021-03-23 12:22:30 +01:00 |
|
Laurent Destailleur
|
6a0e0f4c06
|
Fix #ygosha5698
|
2021-03-22 12:10:51 +01:00 |
|
Laurent Destailleur
|
15440917b1
|
Fix #ygosha5698
|
2021-03-22 11:30:18 +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 |
|
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 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
Frédéric FRANCE
|
337689d5d2
|
code syntax
|
2021-02-22 21:36:42 +01:00 |
|
Laurent Destailleur
|
a4c0459c1e
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/user/list.php
|
2021-01-27 21:09:01 +01:00 |
|
Alexandre SPANGARO
|
7670a4f76c
|
Missing file language & uniformize
|
2021-01-26 04:46:09 +01:00 |
|
Laurent Destailleur
|
e7a77525ca
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-17 12:02:42 +01:00 |
|
Laurent Destailleur
|
10ee98c452
|
Fix tooltip
|
2021-01-17 12:02:15 +01:00 |
|
Laurent Destailleur
|
8cef8df33a
|
Hide advanced feature with ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY
|
2021-01-15 17:35:16 +01:00 |
|
Laurent Destailleur
|
2970dc2151
|
Fix warning
|
2021-01-15 15:14:23 +01:00 |
|
Alexandre SPANGARO
|
54fad02936
|
Fix PR
|
2020-12-08 13:55:51 +01:00 |
|