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
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
Florian HENRY
d7500b1609
fix php warning
2021-03-02 09:45:49 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule
2021-03-01 20:37:16 +01:00
Alexandre SPANGARO
94a861c1c8
Code enhanced - Standardize field name
2021-03-01 04:07:31 +01:00
Alexandre SPANGARO
ca7958f273
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-28 07:32:23 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory
2021-02-23 21:09:01 +01:00
Alexandre SPANGARO
70dddd9bdf
Index & module
2021-02-22 05:58:46 +01:00
Laurent Destailleur
1b129831a9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/projet/element.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-02-09 14:08:49 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat
...
use camelCaps name
2021-02-09 13:29:40 +01:00
Frédéric FRANCE
e2d2048522
deprecate non camelCaps functions
2021-02-09 13:25:55 +01:00
Frédéric FRANCE
04c25a01af
deprecate non camelCaps functions
2021-02-09 13:10:11 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions
2021-02-09 10:26:17 +01:00
Frédéric FRANCE
fe9ee5a398
deprecate non camelCaps functions
2021-02-09 09:49:37 +01:00
Frédéric FRANCE
6d961a1f79
deprecate non camelCaps functions
2021-02-09 09:40:07 +01:00
Florian HENRY
dbbebba497
this->errors is set on triggers action must be set by callers
2021-02-08 20:44:40 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf
2021-02-08 18:30:09 +01:00
Laurent Destailleur
9ac2dc1a6e
Fix phpcs
2021-02-03 20:42:30 +01:00
Laurent Destailleur
348fd0fcb5
FIX #16160
2021-02-03 19:36:10 +01:00
Laurent Destailleur
c5201b95bb
FIX Must not be able to edit vat of all lines if not draft
2021-02-02 16:12:03 +01:00
Laurent Destailleur
f462e353e9
FIX #16079
2021-01-28 09:59:13 +01:00
Laurent Destailleur
62a5c8b6da
FIX Bad balance of begin commit
2021-01-15 15:34:24 +01:00
Laurent Destailleur
7b3ed7301d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f
FIX Bad cleaning of VAT rate when numbers are into code
2021-01-02 16:51:34 +01:00
Laurent Destailleur
bac2ae0d5f
Fix warnings
2020-12-22 17:33:17 +01:00
Laurent Destailleur
832db82fce
Fix warnings
2020-12-18 14:40:45 +01:00
Laurent Destailleur
2c7d872320
Fix warning
2020-12-16 11:07:34 +01:00
Laurent Destailleur
bf01ad8790
Fix warning
2020-12-16 10:55:33 +01:00
Laurent Destailleur
b991badb8c
Fix warning
2020-12-14 13:03:43 +01:00
Laurent Destailleur
3d33d3aa3a
Fix warning
2020-12-13 14:36:00 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
...
doxygen
2020-12-07 22:31:08 +01:00
Laurent Destailleur
a87ef49172
Fix remove warning
2020-12-06 17:59:49 +01:00
Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Laurent Destailleur
59b445a103
Clean dead code
2020-11-28 14:47:39 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Laurent Destailleur
69b06a25e8
Fix code of deletion of objects
2020-11-26 09:16:16 +01:00
Laurent Destailleur
6c42535eb2
Maxi debug v13
2020-11-16 12:20:18 +01:00
Laurent Destailleur
90884d8085
Fix compatibility with date_delivery
2020-11-11 18:08:40 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Laurent Destailleur
e103503bb1
Fix warning php8
2020-11-08 12:34:45 +01:00
Laurent Destailleur
d04bbe09b7
Fix syntax error
2020-11-08 00:38:12 +01:00
Laurent Destailleur
a9fbe9dd6c
Fix remove warning
2020-11-08 00:18:41 +01:00
Laurent Destailleur
e2f5a302be
Fix warning
2020-11-07 23:04:23 +01:00
Laurent Destailleur
ac6f8e4e7c
Debug v13
2020-11-06 11:52:48 +01:00
Laurent Destailleur
1a2d094ce7
Removed dead code
2020-11-04 18:50:49 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
72160deef7
FIX #14979
2020-11-01 17:01:26 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
8daf0c168c
Update facture.class.php
2020-10-31 13:27:29 +01:00
Frédéric FRANCE
8190711342
doxygen
2020-10-30 18:01:01 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Pierre Penelon
1d218b3260
Linting api_invoices.class.php
2020-10-22 09:56:13 +02:00
Pierre Penelon
b8cb080f0d
ADD Retrieve discount from invoice from API
...
As I was unable to retrieve discount ID of created discount from invoice with API.
This commit add a route to get discount from a specific invoice ID.
2020-10-22 09:26:46 +02:00
Laurent Destailleur
fcd4645509
Standardize code: Property product_libelle renamed into product_label
...
Move common vars declaration into parent class.
2020-10-12 19:33:00 +02:00
Laurent Destailleur
eb41a72e27
Properties ->titre have been renamed into ->title
2020-10-07 17:41:36 +02:00
Laurent Destailleur
4c87949be0
Fix scrutinizer
2020-10-07 14:53:10 +02:00
stickler-ci
b9cc780c3c
Fixing style errors.
2020-10-05 21:58:00 +00:00
Pierre Penelon
609a29219d
FIX|Missing require in API : markAsCreditAvailable
...
Quick fix of a problem I encountered earlier when using `markAsCreditAvailable` API method for invoice routes.
The method was using the `DiscountAbsolute` class without importing it resulting in a 500 HTTP error.
2020-10-05 23:54:37 +02:00
Laurent Destailleur
ee40aeecce
Standardize API
2020-10-05 12:21:54 +02:00
Laurent Destailleur
07e1646b3a
Minor fixes
2020-10-04 19:09:25 +02:00
Laurent Destailleur
2ca28c37b6
Merge pull request #14790 from c3do/patch-14
...
FIX API paymentsdistributed accept multicurrency part payment
2020-10-04 11:28:33 +02:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
root
fcbc48fa28
Bug fix last_gen should be date_last_gen
2020-09-25 14:24:26 +02:00
stickler-ci
06d41c029d
Fixing style errors.
2020-09-22 14:41:28 +00:00
Cédric
2dc148eae0
$accepthigherpayment (tested and work)
...
Accept higher payments that it remains to be paid
2020-09-22 16:38:59 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Cédric
a0313fdc52
Update api_invoices.class.php
2020-09-19 22:39:39 +02:00
stickler-ci
3deed42671
Fixing style errors.
2020-09-19 20:05:08 +00:00
Cédric
7306a949e3
Update api_invoices.class.php
2020-09-19 22:02:52 +02:00
Cédric
90d2dfcca7
FIX deleteContact
2020-09-19 22:01:48 +02:00
Cédric
fbc8fe1e0c
Update api_invoices.class.php
2020-09-19 15:14:29 +02:00
Cédric
a0efd47cce
Update api_invoices.class.php
2020-09-19 15:12:57 +02:00
Cédric
9f22882417
Update api_invoices.class.php
2020-09-19 15:05:28 +02:00
stickler-ci
e1751d4bfb
Fixing style errors.
2020-09-19 12:23:53 +00:00
Cédric
720a113125
Update api_invoices.class.php
2020-09-19 14:16:17 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
afc6155783
FIX sign of amount with credit note and multicurrencies
2020-09-15 13:30:59 +02:00
Laurent Destailleur
7a28972c8a
FIX sign of amount of invoice lines for credit note with multicurrency
...
FIX Add INVOICE_POSITIVE_CREDIT_NOTE_SCREEN to solve PT requirement
2020-09-15 11:18:21 +02:00
Scrutinizer Auto-Fixer
73915d51c8
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00:00
Laurent Destailleur
970995d728
Clean code. Replace num_paiement with num_payment everywhere.
2020-09-14 01:03:51 +02:00
Laurent Destailleur
a2df666d34
Standardize code
2020-09-14 00:41:31 +02:00
Laurent Destailleur
e9d0869383
Update api_invoices.class.php
2020-09-14 00:28:43 +02:00
Laurent Destailleur
dcdce246b1
Update api_invoices.class.php
2020-09-14 00:26:16 +02:00
stickler-ci
8d3bc3ee6f
Fixing style errors.
2020-09-13 13:18:42 +00:00
Cédric
929804f4d2
Update api_invoices.class.php
2020-09-13 15:12:22 +02:00
Laurent Destailleur
1f8278c8ca
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
2020-09-12 04:25:54 +02:00
Laurent Destailleur
64b28020c8
Look and feel v13
2020-09-11 13:14:14 +02:00
Laurent Destailleur
b8fe2188a6
Standardize code around model_pdf
2020-09-10 01:49:09 +02:00
Cédric
1d894f4b7c
FIX ref_ext for invoice lines from API
...
Add and update ref_ext in invoice lines
2020-09-09 13:38:42 +02:00
Laurent Destailleur
d236e21639
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-09-09 12:51:55 +02:00
Laurent Destailleur
05912b3b55
Fix sql error
2020-09-09 12:50:07 +02:00
Scrutinizer Auto-Fixer
c263c8a76c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
Laurent Destailleur
02e07c13c8
Merge branch 'develop' into patch-8
2020-09-04 23:11:00 +02:00
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