Laurent Destailleur
c8da9f97a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-09-04 19:51:22 +02:00
stickler-ci
1cff5e0e03
Fixing style errors.
2020-09-04 17:33:58 +00:00
Cédric
5f4ad2a9fa
NEW ref_ext for Facture lines
2020-09-04 19:32:42 +02:00
Cédric
b60f82966c
Update facture.class.php
2020-09-04 17:54:25 +02:00
Laurent Destailleur
2e609d448c
Fix error message
2020-09-04 16:30:34 +02:00
Juanjo Menent
9bd5ed627f
Fix travis issues
2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43
FIX : #14474 Error when deleting
2020-09-03 12:43:38 +02:00
Laurent Destailleur
7217dc3114
Better perf for phpunit on very large databases
2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +02:00
Tim Otte
0e03578e91
Fixed translation of product units in documents
2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
...
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc
Fixed translation of product units in documents
2020-08-04 11:02:16 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
2d45fd04fe
Doc
2020-07-25 14:47:43 +02:00
Laurent Destailleur
e3126ec999
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/card_presend.tpl.php
htdocs/multicurrency/class/multicurrency.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-07-25 00:22:47 +02:00
John Botella
fc1de5b4f3
Fix multicurecy option not applied
2020-07-23 11:10:18 +02:00
Laurent Destailleur
5ea47f3ade
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
9cd8c3738f
Fix trans
2020-07-05 23:18:19 +02:00
Laurent Destailleur
90d4458aab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-06-27 00:38:51 +02:00
Laurent Destailleur
e4922f38ab
Add missing extrafield and trigger in template invoice creation
2020-06-25 14:01:38 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
02e022ebfa
Fix class not found for supplier credit. Class must be into
...
commoninvoice
2020-06-24 19:59:06 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
964f17c507
Fix escape fields
2020-06-14 21:49:25 +02:00
Laurent Destailleur
83263cc174
Fix supplier sepa
2020-06-14 21:49:12 +02:00
Laurent Destailleur
2d5c35b12a
Fix debug sepa module
2020-06-14 21:46:32 +02:00
Laurent Destailleur
abb8cd260f
Fix escape fields
2020-06-14 21:22:44 +02:00
Laurent Destailleur
f0ca29cc6e
Fix supplier sepa
2020-06-14 21:19:31 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
941362e683
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
2020-06-07 18:59:49 +02:00
Laurent Destailleur
180a0a4557
Info for debug
2020-06-07 18:30:46 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec
add new rule
2020-05-21 01:52:25 +02:00
Laurent Destailleur
f23451e1c9
Update facture.class.php
2020-05-07 23:04:52 +02:00
stickler-ci
7514a625fd
Fixing style errors.
2020-05-07 20:11:59 +00:00
Vaadasch
db8596743c
Update facture.class.php
...
Auto-update dates (if not empty) of services when cloning facture.
Actual code is only for month by month.
If empty (start or end) => do nothing
If set, update for next month if there is only 1d between what had been set and the start (or end) of the month.
If there is more than one day from start or end of the month => do nothing, because we're not sure the service is by month
Worst case scenario : the facture is cloned, the service is updated with new unwanted dates
User need to manually updates date : he would have done that either way
2020-05-07 22:09:55 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
DEMAREST Maxime (Indelog)
1bd9372022
Forgot comments to document news params for the modified methods
2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)
40f1bed8d0
Add possibility to filter stats by ThirdParty type and categorie
2020-04-29 09:17:44 +02:00
Laurent Destailleur
731864eb4a
Removed useless translation keys
2020-04-25 12:43:41 +02:00
Laurent Destailleur
7bbfd2175d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
Laurent Destailleur
b77892451f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-24 16:21:58 +02:00
Laurent Destailleur
21665cdc85
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-04-24 16:21:51 +02:00
Laurent Destailleur
b2b580f6fb
Report error
2020-04-24 15:21:38 +02:00
Laurent Destailleur
42ee9845ad
Report error
2020-04-24 15:21:02 +02:00
Scrutinizer Auto-Fixer
548f3007cf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
86be024dcc
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-23 17:17:42 +02:00
stickler-ci
2633e90890
Fixing style errors.
2020-04-23 15:03:14 +00:00
simicar29
ce94788dd9
Clean line extrafields when deleting recurring invoice
...
Delete extrafields recurring invoice lines when deleting parent object
Delete extrafields when deleting a recurring invoice line
2020-04-23 17:01:40 +02:00
stickler-ci
aebc04d30a
Fixing style errors.
2020-04-23 14:33:11 +00:00
simicar29
b68e85703f
Clean line extrafields when deleting invoice
...
Delete extrafields invoice lines when deleting parent object (sql syntax ok for mariadb & pgsql)
Delete extrafields when deleting an invoice line
2020-04-23 16:29:22 +02:00
Laurent Destailleur
3a9add0e70
FIX #13663
2020-04-23 13:37:43 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Laurent Destailleur
40b3db940c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-20 14:44:36 +02:00
Laurent Destailleur
ea60d0be63
FIX #13618
2020-04-17 10:27:38 +02:00
ATM john
b70cd84402
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-14 14:11:12 +02:00
Laurent Destailleur
596ba8d679
Clean deprecated code.
2020-04-13 01:10:35 +02:00
Frédéric FRANCE
251f6d0cb1
Update facture-rec.class.php
2020-04-11 22:53:45 +02:00
Frédéric FRANCE
e9aa27d731
Update facture-rec.class.php
2020-04-11 21:06: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
99ddd25ad5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Laurent Destailleur
84cda962c1
Clean dead code
2020-04-02 12:03:29 +02:00
stickler-ci
9476fbc3e7
Fixing style errors.
2020-04-01 23:16:13 +00:00
Alex Veremme
7330c31204
Fix ##13474: copy extrafields of LINES from a draft invoice to an
...
invoice template
2020-04-02 01:10:56 +02:00
ATM john
81adc6913e
change conf usage
2020-04-01 12:12:30 +02:00
stickler-ci
004d9381f5
Fixing style errors.
2020-03-31 14:36:42 +00:00
ATM john
c466beea3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-03-31 16:28:43 +02:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
d2163c95d6
Save the vat src code when converting down payment into discount
2020-03-26 02:13:34 +01:00
Laurent Destailleur
d662bb97dc
Debug parallel sale feature
2020-03-23 15:02:15 +01:00
Laurent Destailleur
303961b0a6
Fix trans
2020-03-19 12:10:22 +01:00
Laurent Destailleur
8bab245c7e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
ATM john
d3aeec0a7c
Fix situation value transmission
2020-03-18 10:30:15 +01:00
Laurent Destailleur
9525289488
Fix return code of some API
2020-03-17 13:50:20 +01:00
Laurent Destailleur
73f2e9e5de
WIP migrate num_paiement into num_payment
...
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
VESSILLER
1379b2ce87
FIX travis errors
2020-03-12 18:21:44 +01:00
VESSILLER
70ebc61c1f
Module TakePos - NEW add numbering module for cash desk
2020-03-12 17:43:59 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink
...
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
2020-03-12 12:57:04 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
florian HENRY
eaa9d22783
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink
2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type
2020-03-12 09:44:43 +01:00
Laurent Destailleur
82f0d8a3bc
Fix bad params
2020-03-09 17:38:47 +01:00
Laurent Destailleur
3edc3dd382
Fix fields definition
2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d
Fix table fields
2020-03-08 19:25:00 +01:00
Laurent Destailleur
054ffb7547
Depreciate variables not used by Dolibarr.
2020-03-06 14:38:06 +01:00
Laurent Destailleur
ad9d0a3472
Fix graph of product distribution when too much record
2020-03-06 12:45:02 +01:00
Laurent Destailleur
0b37c2c201
FIX #13263
2020-03-04 00:53:07 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files
...
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
ptibogxiv
a71356f0ed
FIX doc
2020-03-03 13:41:19 +01:00
atm-quentin
9446138951
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 12:07:18 +01:00
Laurent Destailleur
46bf65704a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
2020-03-02 21:59:34 +01:00
ptibogxiv
844775501d
Update api_invoices.class.php
2020-03-01 18:46:12 +01:00
ptibogxiv
de30410adc
Update api_invoices.class.php
2020-03-01 18:43:20 +01:00
stickler-ci
b074c689a6
Fixing style errors.
2020-03-01 17:35:12 +00:00
ptibogxiv
6ee8fa4e8a
NEW: api invoice get by ref
2020-03-01 18:33:13 +01:00
Alexandre SPANGARO
da99c89c26
FIX: typo on ckeck method
2020-03-01 05:21:51 +01:00
ATM john
4865e34cc2
fix missing visibility
2020-02-25 23:02:13 +01:00
Laurent Destailleur
457d0668c8
Look and feel v12
2020-02-24 05:23:34 +01:00