Laurent Destailleur
e43b33028c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
c40a73162e
Look and feel v15
2021-10-18 21:20:58 +02:00
Laurent Destailleur
bd73545d08
Merge pull request #18985 from henrynopo/patch-5
...
Fix the rounding issue in case of multi-currency
2021-10-17 13:50:35 +02:00
Laurent Destailleur
dd0809b528
Fix trans labels status
2021-10-16 19:37:57 +02:00
Laurent Destailleur
bd52613331
Fix phpcs
2021-10-16 17:06:10 +02:00
Laurent Destailleur
7ff3e4253f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-16 13:01:27 +02:00
Laurent Destailleur
f8010dfcbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
Laurent Destailleur
52890c64c1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/compta/prelevement/create.php
2021-10-16 12:53:57 +02:00
Laurent Destailleur
faf80b94e9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/stats/index.php
2021-10-16 12:49:18 +02:00
stickler-ci
fb79aaeb0c
Fixing style errors.
2021-10-15 07:19:49 +00:00
Henry
0cb1972674
Update card.php
2021-10-15 15:07:48 +08:00
Laurent Destailleur
a6c3c6b7ec
url
2021-10-14 15:56:01 +02:00
Laurent Destailleur
3875d26a2f
Fix filter for supplierinvoice stats
2021-10-14 15:55:12 +02:00
Laurent Destailleur
db3d16f080
Fix filter tag for supplier invoice statistics
2021-10-14 15:43:35 +02:00
Laurent Destailleur
371c75e76a
FIX list of categories in stats of supplier invoices
2021-10-14 11:58:21 +02:00
Marc de Lima Lucio
29768a1c6e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-13 11:33:04 +02:00
Laurent Destailleur
f3c16ba490
Merge pull request #18905 from indelog/fix_origin_invoice_custom
...
Fix creataing invoice originating for custom module object
2021-10-11 15:26:07 +02:00
Laurent Destailleur
b29bd325fe
Update card.php
2021-10-11 15:25:25 +02:00
atm-florian
57052e2fba
FIX PR#18931 Remove useless explicit call to dol_shutdown
2021-10-11 11:10:14 +02:00
Laurent Destailleur
da815476fd
Fix edit field from tab bank transfer of invoice
2021-10-11 02:00:12 +02:00
Laurent Destailleur
dbf2c0be7e
Fix warning
2021-10-11 01:49:50 +02:00
Laurent Destailleur
a57925b0b7
FIX edition of fields on credit transfer tab
2021-10-11 01:43:36 +02:00
Laurent Destailleur
977a596500
Fix edit link
2021-10-11 01:27:21 +02:00
Laurent Destailleur
7c1d955f6c
Fix: avoid to show warning in some cases
2021-10-11 01:23:00 +02:00
atm-florian
2da16ade6c
FIX: consistent UX when calling a tab from the invoice card with empty ref / id
2021-10-08 17:24:52 +02:00
lvessiller
be4a00213c
FIX optional visibility on create card
2021-10-08 15:58:08 +02:00
Marc de Lima Lucio
4059b64288
FIX: deposit payment terms: langs
2021-10-05 13:00:25 +02:00
Marc de Lima Lucio
cd1eb3b992
FIX: deposit payment terms: PHPDoc
2021-10-05 12:53:04 +02:00
Marc de Lima Lucio
fe62808595
NEW: deposit payment terms: hidden conf to detail lines imported from origin
2021-10-05 12:37:29 +02:00
stickler-ci
39cc2ca5b6
Fixing style errors.
2021-10-05 09:42:52 +00:00
Indelog
6c82b1d0e1
Fix creataing invoice originating for custom module
...
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.
This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
2021-10-05 11:35:43 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms
2021-10-04 19:06:42 +02:00
Marc de Lima Lucio
1b2494855d
NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI
2021-10-04 18:09:24 +02:00
Marc de Lima Lucio
6580c2e308
FIX: deposit payment terms: correctly untag deposit as created from an origin
2021-10-04 15:07:27 +02:00
Frédéric FRANCE
5c4b55fe7f
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:35:17 +02:00
Laurent Destailleur
2671eeb4e5
Responsive
2021-10-01 18:54:14 +02:00
Laurent Destailleur
3d4bb66853
Clean code
2021-09-30 15:59:47 +02:00
Marc de Lima Lucio
81ddc6c0f6
NEW: deposit payment terms: generate deposit from proposal
2021-09-30 12:41:07 +02:00
Marc de Lima Lucio
8cb6cdf1bc
NEW: deposit payment terms: prefill deposit parameters if coming from an origin with the corresponding payment conditions
2021-09-30 11:48:32 +02:00
Laurent Destailleur
37603b451a
Fix token in url
2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
2021-09-27 11:40:47 +02:00
Laurent Destailleur
9b825df158
Clean code
2021-09-27 11:36:40 +02:00
lmarcouiller
f88d12f55d
Fix #18809 : error on client tooltip
2021-09-24 11:16:34 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object
...
NEW : field and behavior in product object
2021-09-23 12:14:09 +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
128f6d9a5c
Fix combo box for thirdparties in invoice stats used bad component
2021-09-23 02:38:53 +02:00
Laurent Destailleur
51b6318f88
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:14:01 +02:00
Laurent Destailleur
60c11725ae
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-23 02:11:11 +02:00
Laurent Destailleur
1e0a7e4342
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:10:39 +02:00
Laurent Destailleur
e2c389a4a9
Fix delete invoice
2021-09-21 14:23:21 +02:00
Laurent Destailleur
b7105d572a
Fix delete of invoice not complete (some fk_invoice still filled)
2021-09-21 14:20:01 +02:00
stickler-ci
d919ef9c4c
Fixing style errors.
2021-09-20 17:57:10 +00:00
Yannick Warnier
c40b22facd
Add turnover homepage box
2021-09-20 19:41:13 +02:00
Laurent Destailleur
5c8fb38426
Fix add del* action into list of sensitive actions
2021-09-19 14:41:46 +02:00
Laurent Destailleur
d760686239
Fix case of newtoken()
2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a
Fix add action delete* as sensitive action
2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469
Fix Add action classify as sensitive actions
2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904
Add deletecontact as sentitive action
...
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
5f5c659b76
Merge pull request #18710 from aspangaro/15a14
...
NEW Customer invoice template list - Add input date from/to
2021-09-17 11:50:29 +02:00
Christian Foellmann
fd1d4d9073
add missing css classes to buttons
2021-09-16 11:33:42 +02:00
Alexandre SPANGARO
cb37c42b5e
NEW Customer invoice template list - Add input date from/to
2021-09-14 04:50:05 +02:00
Laurent Destailleur
034c5651c8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/eventorganization/class/conferenceorbooth.class.php
htdocs/langs/en_US/eventorganization.lang
htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
4705d41ed2
FIX Relative discount with high nb of decimals
2021-09-08 22:00:16 +02:00
Laurent Destailleur
57a2ea3a53
Fix sql error
2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5
Fix sql error
2021-09-08 19:45:55 +02:00
jpb
65a2486f94
merge conflict
2021-09-06 09:43:52 +02:00
Laurent Destailleur
0d6296e417
Merge pull request #18539 from GurvanKervern/undef4
...
Undef4
2021-09-05 01:57:16 +02:00
Laurent Destailleur
ee066ad725
Cast sql var
2021-09-03 21:25:43 +02:00
Laurent Destailleur
c4621f0433
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-09-03 18:04:14 +02:00
Laurent Destailleur
2e3b6b2fc8
Backport sql injection fix from develop
2021-09-03 18:00:28 +02:00
Laurent Destailleur
77e9f15360
Work on #18448
2021-09-02 22:52:17 +02:00
Laurent Destailleur
8600d8d00d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-01 22:50:06 +02:00
Laurent Destailleur
7c5621a2d4
Merge pull request #18552 from aspangaro/15a12
...
NEW Invoice list - Use complete country select field with EEC or not
2021-09-01 17:17:48 +02:00
Scrutinizer Auto-Fixer
312ca95feb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-08-31 18:18:28 +00:00
Laurent Destailleur
0aa4868c34
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-31 13:14:01 +02:00
Alexandre SPANGARO
0132788266
NEW Invoice list - Use complete country select field with EEC or not
2021-08-30 13:56:31 +02:00
henrynopo
3240a3652d
Update card.php
2021-08-30 15:34:59 +08:00
GurvanKervern
b242387c43
Fix undef4-2
...
PHP8 warnings
2021-08-29 22:46:39 +08:00
Laurent Destailleur
81a8efd856
Restore error message
2021-08-28 20:14:23 +02:00
Laurent Destailleur
8870662200
Merge pull request #18475 from OPEN-DSI/v14-fix-invoice-fetch-not-found-syslog-level
...
FIX invoice fetch not found syslog debug level instead of error
2021-08-28 20:12:45 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
...
replace remaining SubmitCancel buttons
2021-08-28 18:39:06 +02:00
Laurent Destailleur
5cd609e14e
Merge pull request #18507 from henrynopo/patch-5
...
Customer Invoice - Multicurrency Remaining to Pay (updated)
2021-08-28 17:36:01 +02:00
henrynopo
11497d4bf0
Update card.php
2021-08-28 22:38:17 +08:00
Laurent Destailleur
f825d3fda4
Trans
2021-08-28 13:27:55 +02:00
Laurent Destailleur
51a4d7630f
Clean code
2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312
Clean code
2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6
Clean code
2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5
Clean code by adding cast int.
2021-08-27 16:33:03 +02:00
henrynopo
a79abfd4e0
Update card.php
2021-08-26 10:37:03 +08:00
stickler-ci
bafe22ff77
Fixing style errors.
2021-08-26 02:29:45 +00:00
henrynopo
f6daad4480
Update card.php
2021-08-26 10:25:32 +08:00
Christian Foellmann
f094b4c70c
fix up most of the remaining submit inputs
2021-08-24 17:04:17 +02:00
Laurent Destailleur
07ab352877
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2021-08-24 16:37:18 +02:00
lvessiller
a4a44faa7f
FIX change LOG_DEBUG with LOG_WARNING in syslog and remove sql error in syslog (already done)
2021-08-24 16:21:55 +02:00
Laurent Destailleur
8aa262f302
Merge pull request #18453 from aspangaro/14p15
...
FIX #18353 Invoice list translation issue
2021-08-24 15:29:32 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
...
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
Laurent Destailleur
15da97f1da
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/compta/facture/card.php
htdocs/product/price.php
2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/price.php
2021-08-24 15:00:35 +02:00
Laurent Destailleur
8b2c82dd23
Fix position of fields
2021-08-24 14:27:18 +02:00
Alexandre SPANGARO
efb78d7431
FIX Invoice list - Wrong name for column total_tva
2021-08-24 14:22:36 +02:00
Alexandre SPANGARO
7b829bc899
FIX Field already present in SQL request
2021-08-24 14:22:21 +02:00
Laurent Destailleur
4a32788bff
Merge pull request #18463 from aspangaro/14p14
...
FIX Invoice list - Wrong name for column total_tva
2021-08-24 14:20:57 +02:00
lvessiller
4efe2a0e09
FIX invoice fetch not found syslog debug level instead of error
2021-08-24 08:20:40 +02:00
Laurent Destailleur
a6ddc90d5b
Fix responsive
2021-08-23 23:53:58 +02:00
Laurent Destailleur
dc006b0ebb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9
Cast numeric into on sql request
2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85
Fix cast into variable into sql request.
2021-08-23 17:41:11 +02:00
Alexandre SPANGARO
56c23b79e0
FIX Invoice list - Wrong name for column total_tva
2021-08-22 14:02:33 +02:00
Alexandre SPANGARO
dd51e24afc
FIX Field already present in SQL request
2021-08-22 14:01:29 +02:00
Alexandre SPANGARO
8bdf58b942
FIX #18353 Invoice list translation issue
2021-08-20 21:42:43 +02:00
Christian Foellmann
d706c3b1ec
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
2021-08-20 14:41:30 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice
...
NEW : mass action paid customer invoice
2021-08-17 19:10:49 +02:00
Laurent Destailleur
794db94178
Update list.php
2021-08-17 19:08:55 +02:00
Laurent Destailleur
22e595e572
Merge pull request #18420 from henrynopo/patch-1
...
Customer Invoice - Multicurrency Remaining to Pay
2021-08-17 15:26:36 +02:00
Laurent Destailleur
92d6ad9597
Removed old simple POS module ('cashdesk' module)
2021-08-17 04:57:53 +02:00
stickler-ci
b92fe38bc0
Fixing style errors.
2021-08-16 01:47:49 +00:00
henrynopo
9a65cbeab7
Customer Invoice - Multicurrency Remaining to Pay
...
Added the remainder to be paid in multicurrency mode.
2021-08-16 09:39:09 +08:00
Laurent Destailleur
896cdf4845
Update list.php
2021-08-11 22:24:07 +02:00
Laurent Destailleur
f9f1440226
Merge branch 'develop' into salesrepresentativeinorderandinvoicelist
2021-08-11 22:22:26 +02:00
Marc de Lima Lucio
08f21e3fc4
FIX: invoice validation: when checking if any vat rate has a negative amount, prevent false positives with -1E-14 amounts
2021-08-10 10:23:56 +02:00
jpb
f99ba2c1e1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
2021-08-04 17:26:23 +02:00
Marc de Lima Lucio
9d234a8541
FIX: multicurrency: fields in discount unitialized when creating deposit
2021-08-03 18:32:22 +02:00
Laurent Destailleur
0058e32207
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/class/html.form.class.php
htdocs/projet/tasks/time.php
2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/accountancy/tpl/export_journal.tpl.php
htdocs/projet/tasks/time.php
2021-08-02 18:31:26 +02:00
Laurent Destailleur
8077fae42e
Code comment
2021-08-02 17:56:58 +02:00
Alexandre SPANGARO
262dd1600b
FIX: Invoice - Missing button to reopen an abandoned situation invoice
2021-07-29 06:23:12 +02:00
stickler-ci
2f0ba41a53
Fixing style errors.
2021-07-20 13:35:10 +00:00
jpb
1237c5ba55
add msg to formconfirm on propal invoice and commande
2021-07-20 14:46:56 +02:00
Laurent Destailleur
638a66fbb9
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
2021-07-14 14:49:06 +02:00
Laurent Destailleur
b552c6b4fe
Fix status color
2021-07-14 14:32:05 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop
...
NEW add hookmanager on note pages
2021-07-11 20:25:16 +02:00
stickler-ci
a8752bf097
Fixing style errors.
2021-07-11 07:46:34 +00:00
fr69400
c7ad0a59c9
Update note.php
2021-07-11 09:45:38 +02:00
stickler-ci
4272f93aa4
Fixing style errors.
2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d
NEW add hookmanager on note pages
2021-07-09 18:36:21 +02:00
Laurent Destailleur
7013f01a41
Fix look and feel v14
2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032
Fix trouble with product id = -1
2021-07-04 21:02:02 +02:00
Laurent Destailleur
6ae1d192e4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/card.php
2021-07-02 16:14:12 +02:00
Laurent Destailleur
01cf608ef4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-02 16:06:48 +02:00
Laurent Destailleur
a7f850dafb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-07-02 16:05:51 +02:00
Laurent Destailleur
7c2121c439
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/tpl/objectline_edit.tpl.php
2021-06-30 15:06:16 +02:00
Laurent Destailleur
51456741d9
FIX Can't edit replacement invoice
...
FIX Status of invoice when making a replacement invoice
2021-06-30 12:43:44 +02:00
atm-arnaud
8772c53723
FIX deposit can create credit note in payment conf
2021-06-30 12:37:21 +02:00
Laurent Destailleur
56787bc292
Update card.php
2021-06-29 19:14:03 +02:00
Francis Appels
1b7b45d72a
Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2
2021-06-29 16:56:48 +02:00
Francis Appels
e4f61d430f
Invoice php 8 issue and warnings.
...
Seems if ("" < 0) is true in php 8
2021-06-29 16:33:24 +02:00
lmarcouiller
923a015aac
Fix #18014 : update of compta/facture/card.php
2021-06-28 11:38:34 +02:00
Laurent Destailleur
67e7556f70
Merge pull request #18032 from OPEN-DSI/new-invoice-create-from-clone-errors
...
NEW get errors on create invoice from clone
2021-06-26 11:53:45 +02:00
Laurent Destailleur
12d591b848
css
2021-06-26 00:18:46 +02:00
Laurent Destailleur
ccffb36a37
CSS
2021-06-26 00:14:53 +02:00
Laurent Destailleur
6e3647af2c
Debug v14
2021-06-26 00:08:19 +02:00
Laurent Destailleur
d2485033d7
Fix deletion of template invoice
2021-06-25 23:10:42 +02:00
lvessiller
24acc82ca6
NEW get errors on create invoice from clone
2021-06-25 16:40:39 +02:00
Laurent Destailleur
11a71d8d2f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
2021-06-23 11:41:30 +02:00
Laurent Destailleur
034906a129
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
2021-06-23 11:30:44 +02:00
Laurent Destailleur
c9d4ccd40a
Merge pull request #17845 from atm-gauthier/fix_libstatus_invoice_in_linked_objects_block
...
FIX : need to add payment sum to getlibstatus function in object linked block (bug still exists in 13.0)
2021-06-23 10:48:22 +02:00
Laurent Destailleur
56212508e7
Update linkedobjectblock.tpl.php
2021-06-23 10:47:23 +02:00
Laurent Destailleur
7046791377
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-19 14:16:39 +02:00
Laurent Destailleur
53295a0cb1
Fix phpcs
2021-06-18 01:06:28 +02:00
Laurent Destailleur
88ff0e4795
Fix PHPCS
2021-06-18 00:59:18 +02:00
Gauthier PC portable 024
564a3b66c2
FIX : method exists
2021-06-14 17:08:16 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Laurent Destailleur
aceeb9558f
css
2021-06-14 01:13:46 +02:00
Laurent Destailleur
34cebe6aa3
Look and feel v14
2021-06-14 01:11:39 +02:00
Frédéric FRANCE
791e4ab056
fix warning
2021-06-13 15:59:22 +02:00
Laurent Destailleur
f13dcb5376
Fix merge
2021-06-12 15:44:03 +02:00
Laurent Destailleur
756786f717
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Frédéric FRANCE
86eea2c4fc
Update list.php
2021-06-10 20:55:00 +02:00
Frédéric FRANCE
3f40a65f26
fix warnings
2021-06-10 20:53:29 +02:00
Laurent Destailleur
1bf63c7862
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
2021-06-10 16:53:09 +02:00
Laurent Destailleur
1950e50c89
Fix test
2021-06-10 16:31:28 +02:00
Laurent Destailleur
c8c9fb7700
FIX #17847
2021-06-10 16:29:30 +02:00
Alexandre SPANGARO
08186fdff1
Fix warning - search_societe is already present
2021-06-10 06:28:09 +02:00
Alexandre SPANGARO
b216c81c60
FIX Customer invoice list - Pagination lost search_date_xxx information
2021-06-10 06:22:03 +02:00
Laurent Destailleur
53af424a3d
Fix total tva
2021-06-10 02:12:29 +02:00
Laurent Destailleur
5f925d9e3b
Fix total -> total_ht
2021-06-10 02:10:58 +02:00
Laurent Destailleur
ae6d2ba9b5
Fix missing user creation/modif of template invoice
2021-06-10 01:56:20 +02:00
Laurent Destailleur
9afe8e54a7
Fix
2021-06-10 00:41:15 +02:00
Laurent Destailleur
fb46ece906
Fix yogosha 6347
2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6
Fix permission
2021-06-08 16:19:21 +02:00
Frédéric FRANCE
0ea0966b09
Update card.php
2021-06-08 12:01:05 +02:00
Frédéric FRANCE
b1c3a7cf48
avoid fatal error
2021-06-08 10:38:34 +02:00
Gauthier PC portable 024
e64c27e1c3
FIX : need to add payment sum to getlibstatus function in object linked block
2021-06-08 10:27:33 +02:00
Laurent Destailleur
2182e7fd54
Look and feel v14
2021-06-04 14:36:52 +02:00
Laurent Destailleur
27018bd4b4
Fix group by
2021-06-04 14:25:32 +02:00
Laurent Destailleur
8b5922a0df
Update card.php
2021-06-04 12:57:43 +02:00
Laurent Destailleur
43be7cf996
Update card.php
2021-06-04 12:56:40 +02:00
Laurent Destailleur
292d5f6a15
Update card.php
2021-06-04 12:55:03 +02:00
stickler-ci
dfb2e54750
Fixing style errors.
2021-05-27 14:25:42 +00:00
Frans Bosman
fd2d10d443
Update card.php
2021-05-27 16:23:33 +02:00
stickler-ci
c31530e7ed
Fixing style errors.
2021-05-27 10:24:18 +00:00
Frans Bosman
61753791b4
Update card.php
...
Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
2021-05-27 12:20:42 +02:00
Laurent Destailleur
4b47611e23
Debug v14
2021-05-25 21:21:09 +02:00
Laurent Destailleur
91f85abb7e
Fix only comment to understand code are allowed
2021-05-20 14:55:37 +02:00
Florian HENRY
d70bbe29b5
fix
2021-05-20 14:03:18 +02:00
Florian HENRY
7a9102ac60
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_massaction_paid_custom_invoice
2021-05-20 14:02:05 +02:00
Florian HENRY
4d7b09ff2a
done
2021-05-20 14:00:43 +02:00
Laurent Destailleur
afd9c09c8f
Merge pull request #17685 from FHenry/dev_fix_search_filter_company_Var
...
fix: change societe by company varaible name in all file
2021-05-20 13:54:01 +02:00
Florian HENRY
5e6d6ccf67
same bug on invoie list
2021-05-20 13:45:52 +02:00
Florian HENRY
7c6ac86d32
ongoing
2021-05-20 13:41:23 +02:00
Florian HENRY
62bc6e9e1f
on going
2021-05-20 13:15:32 +02:00
Florian HENRY
7874be6e37
bad comment remove
2021-05-20 12:48:18 +02:00
Florian HENRY
d93cf0beb7
fix: change societe by company varaible name in all file
2021-05-20 12:36:26 +02:00
Laurent Destailleur
dbd7292cd6
Replace doubleval into floatval
2021-05-20 09:22:55 +02:00
Sylvain Legrand
a3d1b49c65
Error in list when using alias name of thirdparty
2021-05-19 19:08:58 +02:00
Laurent Destailleur
217ee260c2
css
2021-05-19 15:11:47 +02:00
Laurent Destailleur
cf0da5cee7
css
2021-05-19 15:00:44 +02:00
Anthony Berton
c02e3eed6b
checked
2021-05-18 18:45:07 +02:00
Laurent Destailleur
8e39eff180
Look and feel v14
2021-05-18 18:18:00 +02:00
Laurent Destailleur
74f35177ff
Fix group by
2021-05-18 13:20:14 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list
2021-05-18 12:27:30 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list
...
Add popup thirdparty info in list
2021-05-18 12:15:51 +02:00
Laurent Destailleur
b6dbe45242
Fix permissions on page to move position of file
2021-05-18 01:58:54 +02:00
Anthony Berton
70a062e2c1
change position
2021-05-17 23:59:42 +02:00
Anthony Berton
6fe9fe330d
delete fetch
2021-05-17 23:54:31 +02:00
Anthony Berton
58db723502
thirdparty info popup list
2021-05-17 23:27:33 +02:00
Anthony Berton
31cd71d8a3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list
2021-05-17 18:34:41 +02:00
Anthony Berton
68130ec637
Merge branches 'develop' and 'develop' of https://github.com/Dolibarr/dolibarr into salesrepresentativeinorderandinvoicelist
2021-05-17 18:34:20 +02:00
Anthony Berton
09ab930806
sale_representative_order_invoice_list
2021-05-17 18:31:19 +02:00
Anthony Berton
0b7f474dd3
look_feel user author in list
2021-05-17 18:04:21 +02:00
Laurent Destailleur
608e4e8891
Merge pull request #17601 from ptibogxiv/patch-426
...
NEW report contact/adresses on credit note from invoice
2021-05-17 09:12:12 +02:00
Laurent Destailleur
4768729c09
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/core/class/rssparser.class.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/expedition/list.php
2021-05-17 07:57:32 +02:00
stickler-ci
50d4d28c14
Fixing style errors.
2021-05-14 11:54:50 +00:00
Ferran Marcet
ce6df0ee4a
FIX: Filter of the dates in the lists is lost
2021-05-14 13:50:12 +02:00
stickler-ci
05ea8761a1
Fixing style errors.
2021-05-13 08:28:14 +00:00
ptibogxiv
b9336570ff
NEW report contact/adresses on credit note from invoice
...
keep same contact/adresses from source invoice (ir: usefull for correct notifications)
2021-05-13 10:26:09 +02:00
Laurent Destailleur
b5a43c8d1d
FIX #17502
2021-05-11 21:31:43 +02:00
Laurent Destailleur
bccd1b9a41
Update prelevement.php
2021-05-11 19:21:08 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode
2021-05-11 18:09:05 +02:00
Laurent Destailleur
73972bcbd0
More complete log
2021-05-11 10:30:46 +02:00
Frédéric FRANCE
1d38dc11c6
uniformize supplier cards
2021-05-07 21:28:35 +02:00
Laurent Destailleur
f2e61ff807
Fix substitution into topic
2021-05-04 18:04:09 +02:00
Laurent Destailleur
526235d020
Fix substitution of mix html/nohtml
...
Fix send email reminder for past due date of invoices
More PHPUnit test
2021-05-04 13:33:18 +02:00
Laurent Destailleur
c82317c8af
Fix missing include
2021-05-04 11:06:24 +02:00
Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop
...
FIX formAddObjectLine cant be overloaded by hook
2021-05-03 13:16:45 +02:00
Laurent Destailleur
e99355a0c2
Clean html
2021-04-30 15:22:17 +02:00
fr69400
96baa1ef49
wrong variable name
2021-04-29 17:36:45 +02:00
fr69400
d9e25c61bb
formAddObjectLine cant be overloaded by hook
2021-04-29 15:32:15 +02:00
Laurent Destailleur
655056ed31
Debug v14
2021-04-29 12:10:55 +02:00
lmarcouiller
97633e34f2
Fix : Bug facture.class.php
2021-04-27 16:47:27 +02:00
Laurent Destailleur
4b204301a9
Enhance logs
2021-04-27 03:25:49 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect
...
13 fix combo prospect
2021-04-27 01:18:57 +02:00
Laurent Destailleur
efbed70286
Update card.php
2021-04-27 01:17:26 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +02:00
stickler-ci
6387b929cc
Fixing style errors.
2021-04-26 12:30:44 +00:00
Robin-Yann
9fc0416664
Update card.php
2021-04-26 14:28:43 +02:00
Robin-Yann
c1f3626cd7
Update card.php
2021-04-26 14:11:24 +02:00
Robin-Yann
676067eafc
Update card.php
2021-04-26 10:21:25 +02:00
stickler-ci
ebd3b00016
Fixing style errors.
2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect
2021-04-26 09:21:32 +02:00
Laurent Destailleur
389b71bc7e
Clean API
2021-04-25 19:21:48 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Laurent Destailleur
6c2d9d3b3c
Fix permission to reopen invoice.
2021-04-25 13:17:47 +02:00
Laurent Destailleur
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +02:00
Laurent Destailleur
48c26fd614
Fix add option INVOICE_DISALLOW_REOPEN to lock problematic feature
2021-04-24 18:43:24 +02:00
Laurent Destailleur
61df76dd9a
Fix pb in date format %a %b when using a negative timezone
...
Enhance date management and unit tests.
2021-04-19 12:48:08 +02:00
Laurent Destailleur
23b11491d2
Can filter also on payment mode
2021-04-19 11:11:01 +02:00
Laurent Destailleur
83b5a325df
Load of template before the loop.
2021-04-19 10:47:12 +02:00
Laurent Destailleur
a74b237a7b
Add a schedule dtask to send reminder by email on date due.
2021-04-19 10:35:19 +02:00
Laurent Destailleur
aec2212b44
Merge pull request #17293 from cmfpmatik/cmfpmatik-patch-16042021
...
Update facture list.php
2021-04-16 20:39:23 +02:00
Oarces DEV
593e23220d
Update list.php
...
Add filter for "Bill Short Status Draft" and "Bill Short Status Draft", that they has can be viewed together.
Secretaries appreciate having this overall visibility.
2021-04-16 14:34:23 +02:00
Laurent Destailleur
db5dcd3e52
NEW When a doc file is shared, link is visible from main page of doc.
2021-04-15 17:56:55 +02:00
Laurent Destailleur
f1d55d38ba
Show link to shared file if it exists.
2021-04-15 17:09:15 +02:00
Laurent Destailleur
bd1aa38c64
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2021-04-15 12:04:08 +02:00
Laurent Destailleur
dcf460e248
Use css on img_picto
2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca
picto_mass_actions
2021-04-14 10:20:34 +02:00
Laurent Destailleur
4dfc90f8cb
Merge pull request #17256 from OGPayet/fix/ComptaFactureDateClosingOptionPosition
...
fix date closing option position
2021-04-13 23:03:02 +02:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Pierre Payet
75ed5e45f2
fix date closing option position
2021-04-13 17:21:51 +02:00
Alexandre SPANGARO
4b9bf40a8f
move include_once to include when it's a tpl
2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Laurent Destailleur
667481acd5
Fix #yogosha5832 - Missin test on permission for /index routes on APIs
2021-04-08 19:05:28 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35
...
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-07 02:51:32 +02:00
Laurent Destailleur
2e862f815a
Fix field total_ht
2021-04-07 00:44:01 +02:00
Laurent Destailleur
e23ddb383e
css
2021-04-06 23:38:52 +02:00
Laurent Destailleur
7c27ab6121
Fix css
2021-04-06 23:35:30 +02:00
stickler-ci
1419b75f22
Fixing style errors.
2021-04-06 08:32:27 +00:00
Alexandre SPANGARO
36e4f5aa22
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
Laurent Destailleur
a3fb8d3e14
Factorize code
2021-04-05 19:34:56 +02:00
Alexandre SPANGARO
f64d0377c5
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-04 06:03:41 +02:00
Laurent Destailleur
e01b6b6789
FIX filter on date on invoice list
2021-03-31 18:39:59 +02:00
Laurent Destailleur
fb7cfe6c50
Fix sql error
2021-03-30 19:15:20 +02:00
Laurent Destailleur
3744bc6a7a
FIX #yogosha5746 - next step (work in progress)
2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494
FIX #yogosha5746 - next step (work in progress)
2021-03-30 17:45:15 +02:00
Laurent Destailleur
6e422d26f3
FIX #yogosha5746 - next step (wip)
2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586
Clean sql
2021-03-30 03:37:54 +02:00
Laurent Destailleur
b702d2b534
Fix CSRF for more GET
2021-03-29 22:58:44 +02:00
Laurent Destailleur
0740633ec8
Update facture-rec.class.php
2021-03-29 20:42:59 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22
2021-03-29 20:35:35 +02:00
Laurent Destailleur
5c2ee240b2
FIX #yogosha5752
2021-03-29 15:59:37 +02:00
Laurent Destailleur
3a4bb69c05
FIX #yogosha5749
2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4
FIX #yogosha5746
2021-03-29 15:07:23 +02:00
Laurent Destailleur
b929641fe1
Look and feel v14
2021-03-29 13:00:17 +02:00
Laurent Destailleur
a5d84200dc
Clean code for invoice list
2021-03-28 19:22:04 +02:00
Alexandre SPANGARO
2a1cc04b66
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-28 06:16:33 +02:00
Laurent Destailleur
eeba9e4d50
Code comment
2021-03-24 21:58:06 +01:00
Laurent Destailleur
21a9779fe2
FIX inconsistency in margin recording with option "Force to sale price"
2021-03-24 21:49:45 +01:00
Laurent Destailleur
ca1715df96
Add some protection for SQL injection
2021-03-22 13:31:06 +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
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22
2021-03-20 13:42:54 +01:00
Laurent Destailleur
d8aa5f5eab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2021-03-20 12:42:46 +01:00
Laurent Destailleur
7f6044c52e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/task.php
2021-03-20 12:18:40 +01:00
Laurent Destailleur
827a952dca
Merge pull request #16839 from dolibit-ut/patch-130
...
Update card.php
2021-03-20 11:49:18 +01:00
Laurent Destailleur
3edeb8b4aa
Merge pull request #16840 from dolibit-ut/patch-131
...
Update document.php
2021-03-20 11:49:06 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments
2021-03-20 10:00:24 +01:00
Frédéric FRANCE
2de2f1ce4d
fix nested comments for doxygen
2021-03-20 09:02:29 +01:00
Laurent Destailleur
d83d005284
FIX #yogosha5674
2021-03-19 12:44:59 +01:00
UT from dolibit
46c23807e9
Update document.php
...
$helpurl -> $help_url
2021-03-19 09:38:33 +01:00
UT from dolibit
b4e929e57f
Update card.php
...
$helpurl -> $help_url
2021-03-19 09:36:49 +01:00
Laurent Destailleur
3522af926a
Merge pull request #16799 from AlexisLaurier/addInvoiceListHook
...
invoice list - add new standard hooks
2021-03-18 22:58:18 +01:00
Laurent Destailleur
43494df56c
Merge pull request #16790 from AlexisLaurier/addGetNomUrlToInvoice
...
add invoice getNomUrl hook
2021-03-18 22:57:37 +01:00
Laurent Destailleur
461d748f97
Fix #yogosha235
2021-03-18 20:27:36 +01:00
Alexis LAURIER
5b72193f0d
invoice list - ajust hooks
2021-03-18 17:06:49 +01:00
Alexis LAURIER
ada5d728b5
invoice list - ajust hooks
2021-03-18 17:00:57 +01:00
Alexis LAURIER
06bc999614
Add group by and having hooks on invoice list
2021-03-18 16:51:02 +01:00
Alexis LAURIER
c3f8e0e397
invoice list - add new standard hook
2021-03-18 16:21:54 +01:00
Alexis LAURIER
b416223194
fix
2021-03-18 11:16:49 +01:00
Alexis LAURIER
c33347b461
add invoice getNomUrl hook
2021-03-18 11:10:43 +01:00
Laurent Destailleur
73e55f1b73
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-17 18:44:47 +01:00
Laurent Destailleur
0da5c89973
Look and feel v14
2021-03-17 18:24:37 +01:00
Frédéric FRANCE
519b08b782
fix php8 warnings
2021-03-16 18:25:25 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25
...
Translation "Generated documents"
2021-03-16 10:25:31 +01:00
Alexandre SPANGARO
03481a0197
Uniformize translation
2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
4fd24c6855
Translation "Generated documents"
2021-03-16 04:04:18 +01:00
Alexandre SPANGARO
6e17a588bb
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-16 03:26:28 +01:00
Laurent Destailleur
cc10106a21
Fix protection on int
2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +01:00
Laurent Destailleur
ab89d85095
Fix for php8
2021-03-08 11:33:07 +01:00
Laurent Destailleur
4d409e23f5
Missing declaration of properties
2021-03-08 09:16:33 +01:00
Laurent Destailleur
a1d97274fb
Clean code for php8
2021-03-08 09:14:23 +01:00
Laurent Destailleur
1affaa8c87
fix phpunit
2021-03-07 20:26:36 +01:00
Laurent Destailleur
1ca3e433d2
Fix phpunit
2021-03-07 19:55:09 +01:00
Laurent Destailleur
0f7085154b
Fix phpunit
2021-03-07 19:47:55 +01:00
Laurent Destailleur
91245e22d4
Fix phpunit phpv8
2021-03-07 19:16:09 +01:00
Laurent Destailleur
63aa2f4ec2
Fix phpunit
2021-03-06 12:50:38 +01:00
Laurent Destailleur
7959bc99d7
Fix phpcs
2021-03-06 10:39:51 +01:00
Laurent Destailleur
3cbced439a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/compta/bank/line.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/ticket.lib.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/cron/list.php
htdocs/expedition/card.php
htdocs/mrp/mo_list.php
htdocs/product/stock/productlot_card.php
htdocs/public/emailing/mailing-read.php
htdocs/public/emailing/mailing-unsubscribe.php
htdocs/ticket/list.php
test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
Laurent Destailleur
31845e1dae
Fix phpcs
2021-03-04 00:04:43 +01:00
Laurent Destailleur
6503c81f47
FIX #16530
2021-03-03 23:55:28 +01:00
Laurent Destailleur
30dd4ac6ec
FIX #16530
2021-03-03 22:52:02 +01:00
Laurent Destailleur
f11a85a3e3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7
FIX #16503
2021-03-02 23:09:55 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
stickler-ci
35cb48d649
Fixing style errors.
2021-03-02 11:37:46 +00:00
Laurent Destailleur
1d642f49f7
Update facture.class.php
2021-03-02 12:37:24 +01:00