Commit Graph

102617 Commits

Author SHA1 Message Date
Laurent Destailleur
0ae8403fb4
Merge pull request #18690 from lainwir3d/add_rest_api_key_modify_right
CLOSE #18689 REST API module: add api key generate / modify right.
2021-09-17 12:10:03 +02:00
Laurent Destailleur
ee8e11069c
Merge pull request #18696 from Hystepik/develop#1
Close #18678 : Implemention of tags/categories KM
2021-09-17 11:59:29 +02:00
Laurent Destailleur
fdcd523c55
Merge branch 'develop' into develop#1 2021-09-17 11:59:20 +02:00
Laurent Destailleur
9a6f4bf6d9
Merge pull request #18708 from javieralapps4up/develop
Fix #18707 $search_account and $search_paymenttype are not saved when sorting by any field
2021-09-17 11:51:35 +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
Laurent Destailleur
9d59a574f1
Merge pull request #18712 from cfoellmann/PR/correct-cancel-redirects
fix cancel redirects on product,warehouse cards
2021-09-17 11:50:09 +02:00
Laurent Destailleur
e7ed1d2e08
Merge pull request #18742 from FHenry/dev_barcode_lot_18741
NEW: Add code codebar column on serial/lot structure
2021-09-17 11:48:16 +02:00
Laurent Destailleur
a0681d460d
Update llx_product_lot.sql 2021-09-17 11:47:42 +02:00
Laurent Destailleur
2132bd1b9f
Merge pull request #18744 from Hystepik/develop#5
Fix error on html.for.class on ismultientitymanaged test
2021-09-17 11:24:32 +02:00
Lucas Marcouiller
0191e3b6ea Fix error on html.for.class on ismultientitymanaged test 2021-09-17 11:23:16 +02:00
Florian HENRY
61fddfd3b0 syntax 2021-09-17 11:09:08 +02:00
Florian HENRY
aa575cd250 add column 2021-09-17 11:06:25 +02:00
Laurent Destailleur
6a73fc6e44
Merge pull request #18724 from ibuiv/patch-1
Fix ldap passw bug with activedirectory
2021-09-17 10:54:05 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes
add missing css classes to buttons
2021-09-17 10:52:13 +02:00
Laurent Destailleur
775544d47d
Merge pull request #18727 from Hystepik/develop#4
Close #18677 : new show articles of KM
2021-09-17 10:51:38 +02:00
Laurent Destailleur
7cbb7d7f44
Merge pull request #18733 from esion-net/patch-3
NEW Expose bank account holder, label and number
2021-09-17 10:48:52 +02:00
Laurent Destailleur
c79d7fafa8
Merge pull request #18736 from FHenry/dev_new_add_link_mo_object
NEW: add MRP into Object Linked Box
2021-09-17 10:47:57 +02:00
Florian HENRY
67c468025d add trans 2021-09-16 17:22:22 +02:00
Florian HENRY
47efccad75 remove debug 2021-09-16 17:13:34 +02:00
Florian HENRY
06b6ada060 fix trad 2021-09-16 17:13:03 +02:00
Florian HENRY
820a007731 NEW: add MRP into Object Linked Box 2021-09-16 17:10:06 +02:00
Laurent Destailleur
253f01edcb Fix page of payment 2021-09-16 16:33:51 +02:00
Florian
b9e637a2b2
Expose bank account holder, label and number
NEW Expose bank account holder, label and number
2021-09-16 15:52:19 +02:00
Laurent Destailleur
49ef24edcb Fix trans 2021-09-16 15:16:18 +02:00
Laurent Destailleur
fd3418d91d NEW Can edit the translation key of an overwrote translation key. 2021-09-16 15:13:15 +02:00
Laurent Destailleur
b70764af88 Fix translation of ticket categories 2021-09-16 15:08:04 +02:00
Laurent Destailleur
e9a3cca609 Fix lang file 2021-09-16 14:50:38 +02:00
Laurent Destailleur
1177e86f2e Fix language of group of tickets 2021-09-16 14:46:14 +02:00
Laurent Destailleur
d9751704c8 Fix ambiguous field 2021-09-16 14:37:38 +02:00
Laurent Destailleur
086754e149 Fix translation of category codes 2021-09-16 14:31:20 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
2021-09-16 13:40:05 +02:00
Laurent Destailleur
5b07be0179 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/holiday/list.php
2021-09-16 13:33:49 +02:00
Laurent Destailleur
c68687bdf6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/fournisseurs.php
2021-09-16 13:29:25 +02:00
Laurent Destailleur
87bb971d75 FIX autocalculation of the supplier price in main currency.
Conflicts:
	htdocs/product/fournisseurs.php
2021-09-16 13:22:22 +02:00
lmarcouiller
04a024570c update fetchKnowledge and html.formticket 2021-09-16 13:19:43 +02:00
Laurent Destailleur
f26601e836 FIX autocalculation of the supplier price in main currency. 2021-09-16 13:17:00 +02:00
Laurent Destailleur
9918873719 Better log 2021-09-16 13:07:02 +02:00
Laurent Destailleur
e6cd071e02 Fix email templates 2021-09-16 12:31:33 +02:00
Laurent Destailleur
3a04fc557b Fix email templates 2021-09-16 12:30:46 +02:00
Laurent Destailleur
0fc51b6564 Fix email content 2021-09-16 12:10:40 +02:00
Laurent Destailleur
b18e0e3d1e Add missing translation key 2021-09-16 12:04:46 +02:00
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
stickler-ci
9d3b680259 Fixing style errors. 2021-09-16 07:31:23 +00:00
antonin_tdj
8c1b3efc47
Avoir Error 19 Constraint Violation (in case of password unchanged) 2021-09-16 09:31:00 +02:00
Laurent Destailleur
b18e25db87 Code comment 2021-09-16 03:13:44 +02:00
Laurent Destailleur
aab8d4a628 css 2021-09-16 02:24:25 +02:00
Laurent Destailleur
c907c6ed08 Fix trans 2021-09-16 02:19:08 +02:00
Laurent Destailleur
51d7622434 Fix trans 2021-09-16 02:18:00 +02:00
Laurent Destailleur
2b340579a1 Fix look 2021-09-15 21:12:16 +02:00
Laurent Destailleur
0ab399aa37 Fix try to find the thirdparty from contacts too. 2021-09-15 20:46:48 +02:00