Commit Graph

89030 Commits

Author SHA1 Message Date
Cédric
03e9e17be4
Merge branch 'develop' into patch-3 2020-09-06 17:50:54 +02:00
Laurent Destailleur
2f3022287e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-05 14:15:33 +02:00
Laurent Destailleur
837697b234 Try to merge manually PR #12500 2020-09-05 14:14:56 +02:00
Laurent Destailleur
52fe2a4d96
Merge pull request #14642 from nlouahedj/develop
NEW Algeria data (tva and forme_juridique)
2020-09-05 11:36:47 +02:00
Noureddine LOUAHEDJ
8d7bbe3dcb NEW tva Algerie 2020-09-05 08:58:51 +01:00
Noureddine LOUAHEDJ
ebf718fdae NEW forme_juridique Algerie 2020-09-05 08:58:29 +01:00
Laurent Destailleur
d6f1aa8451
Merge pull request #14639 from c3do/patch-8
NEW ref_ext in llx_facturedet
2020-09-04 23:12:26 +02:00
Laurent Destailleur
84f4020f49
Update llx_facturedet.sql 2020-09-04 23:12:12 +02:00
Laurent Destailleur
02e07c13c8
Merge branch 'develop' into patch-8 2020-09-04 23:11:00 +02:00
Laurent Destailleur
263989019c
Merge pull request #14493 from aspangaro/13a4
NEW Accountancy - Add options to disable accounting on sales, purchases & expense reports
2020-09-04 23:10:15 +02:00
Laurent Destailleur
f04b5c48ea
Update accountancy.lang 2020-09-04 23:09:34 +02:00
Cédric
806cfa84e2
Update llx_product_attribute_combination.sql 2020-09-04 23:08:02 +02:00
Cédric
76a5a42191
Update llx_product_attribute.sql 2020-09-04 23:07:10 +02:00
Cédric
c5fda967c7
add field ref_ext in llx_facturedet 2020-09-04 22:57:21 +02:00
Laurent Destailleur
7e879a8012 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 22:44:49 +02:00
Laurent Destailleur
a2db403abe Fix phpcs 2020-09-04 22:44:31 +02:00
Laurent Destailleur
b2c20c3dfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 22:42:48 +02:00
Laurent Destailleur
451c878cfc Fix add missing field 2020-09-04 22:42:37 +02:00
Laurent Destailleur
fba0fd0bed
Merge pull request #14641 from c3do/patch-9
NEW ref_ext field for Commande lines
2020-09-04 22:41:24 +02:00
Laurent Destailleur
ca29cc0c77
Merge pull request #14632 from OPEN-DSI/new-ticket-type-severity-group-translated-labels
NEW translate classification labels in ticket
2020-09-04 22:39:12 +02:00
Laurent Destailleur
9803da3ac1
Merge pull request #14637 from bafbes/abb120138
fix : unuseful truncation of list name elements
2020-09-04 22:38:08 +02:00
Laurent Destailleur
7cc1e30748
Merge pull request #14638 from OPEN-DSI/new-ticket-public-mail-format
NEW format tickets sent by mail in public interface
2020-09-04 22:37:18 +02:00
Laurent Destailleur
714c86ce54 Typo 2020-09-04 22:33:16 +02:00
Laurent Destailleur
972b95232e Fix typo 2020-09-04 22:30:53 +02:00
stickler-ci
ebb69e9d6e Fixing style errors. 2020-09-04 19:38:49 +00:00
Cédric
e9d6e04c25
NEW field ref_ext in llx_commandedet 2020-09-04 21:36:01 +02:00
Cédric
0a09284b8f
FIX one time is enough 2020-09-04 21:32:12 +02:00
Cédric
e84a2ab07c
Fix addline commande.class.php 2020-09-04 21:26:57 +02:00
Cédric
c06cb1eff3
NEW ref_ext for order lines 2020-09-04 21:25:20 +02:00
Cédric
1f82fcc1f0
NEW ref_ext field for order lines 2020-09-04 21:11:58 +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
Laurent Destailleur
2e7f588cac FIX using decimal on stock correction
Conflicts:
	htdocs/product/stock/product.php
2020-09-04 19:38:56 +02:00
Cédric
38bc98cf7d
ADD ref_ext field in llx_facturedet 2020-09-04 19:38:24 +02:00
Laurent Destailleur
0c1a5d9e25 FIX using decimal on stock correction 2020-09-04 19:34:20 +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
lvessiller
123d33b47c NEW format tickets sent by mail in public interface 2020-09-04 17:50:49 +02:00
bahfir abbes
77afbd4412 fix : unuseful truncation of list name elements 2020-09-04 15:58:21 +01:00
Laurent Destailleur
4fdbfa8224 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 16:30:55 +02:00
Laurent Destailleur
2e609d448c Fix error message 2020-09-04 16:30:34 +02:00
Laurent Destailleur
7094cec42a Fix use same duration code 'on 1 letter' than the production duration
record, also than tha sprintf.
2020-09-04 14:37:55 +02:00
lvessiller
4f68c694b8 NEW fetch object useless on create ticket trigger 2020-09-04 14:25:13 +02:00
Laurent Destailleur
f2a16d860e Enhance method fetchByFkProductChild() 2020-09-04 14:05:35 +02:00
Laurent Destailleur
4383f1d00c
Update ProductCombination.class.php 2020-09-04 13:50:22 +02:00
Laurent Destailleur
0ee40402b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 13:35:31 +02:00
Laurent Destailleur
092b66a7f1 Add variation_ref_ext field 2020-09-04 13:35:16 +02:00
Laurent Destailleur
aa031606b9
Merge pull request #14635 from c3do/patch-7
NEW endpoint getContacts and Clean results
2020-09-04 13:25:36 +02:00
Laurent Destailleur
e21b3f6681 FIX bad route url to delete subproduct with API 2020-09-04 13:23:11 +02:00
Laurent Destailleur
1ceb7c8677 Add ref_ext to product_attribute. 2020-09-04 12:41:56 +02:00