Commit Graph

112767 Commits

Author SHA1 Message Date
altairis-noe
1224327f91 qcstatus everywhere 2021-04-29 17:50:11 +02:00
stickler-ci
d5af15a102 Fixing style errors. 2021-04-29 15:37:19 +00:00
fr69400
96baa1ef49 wrong variable name 2021-04-29 17:36:45 +02:00
jpb
6aa9c35f0f merge conflic 2021-04-29 17:34:56 +02:00
jpb
5da418ce33 merge conflict 2021-04-29 17:27:59 +02:00
Florian HENRY
fd6eacf022 NEW: add Channel column into order list 2021-04-29 16:15:46 +02:00
UT from dolibit
5f7a3571cd
Update llx_00_c_country.sql
countries in english
2021-04-29 16:08:27 +02:00
jpb
330c08ac13 remove number to text type input 2021-04-29 15:59:55 +02:00
UT from dolibit
2c8ab51dac
Update llx_20_c_departements.sql
Portugal (remove '' at fk_region)
2021-04-29 15:55:38 +02:00
Laurent Destailleur
e7e2953a9e Look and feel 2021-04-29 15:49:44 +02:00
UT from dolibit
54ab2e523d
Update llx_10_c_regions.sql
Hungary - sorting & regions in hungarian
2021-04-29 15:40:45 +02:00
stickler-ci
8fda2ba2b4 Fixing style errors. 2021-04-29 13:34:43 +00:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
altairis-noe
f3ede35b4f lang correction 2021-04-29 13:18:14 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +02:00
altairis-noe
b04afc1753 merge conflict resolution 2021-04-29 13:08:24 +02:00
altairis-noe
f7182d43fd add entity in c_productbatch_qcstatus key 2021-04-29 13:00:47 +02:00
altairis-noe
762f41ea86 llx_c_productbatch_qcstatus as dictionnary name 2021-04-29 12:49:15 +02:00
Laurent Destailleur
e3767557d8 Fix phpcs 2021-04-29 12:33:49 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Florian HENRY
a7b093ed81 FIX: Espadon PDF shippment model with long public note now wroking 2021-04-29 11:34:09 +02:00
lmarcouiller
4b4bf9321d littlefix on creation 2021-04-29 10:54:24 +02:00
lmarcouiller
d4fb9c7c47 knowledgemanager finished 2021-04-29 10:49:56 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
Laurent Destailleur
a2245bd7db Fix add of box 2021-04-29 10:13:43 +02:00
Laurent Destailleur
a40083ae1c Fix packaging 2021-04-29 10:03:16 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
daraelmin
68415322ec
Fix v11 wrong alias in natural_search 2021-04-29 10:00:54 +02:00
Dorian Vabre
d1fe595c09 fix on the clear ids 2021-04-29 10:00:49 +02:00
lmarcouiller
6da32015f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-04-29 09:45:30 +02:00
Dorian Vabre
df28491524 every id is now clear in url + in the hash of the securekey 2021-04-29 09:40:47 +02:00
lmarcouiller
799d1de830 Update incoice.lib.php and index.php match eldy's requests 2021-04-29 09:31:49 +02:00
Antonin MARCHAL
6dafb98707 Merge branch 'develop' of https://github.com/ibuiv/dolibarr into develop 2021-04-29 01:20:42 +02:00
Antonin MARCHAL
c89830b25b fix(sql) pmp added to create table both migration and install 2021-04-29 01:17:21 +02:00
Anthony Berton
b6ddea57f3 update 2021-04-29 00:17:55 +02:00
Anthony Berton
bb5a11ff75 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/17185 2021-04-29 00:06:35 +02:00
Anthony Berton
c1e6109c4b Update 2021-04-29 00:03:16 +02:00
Anthony Berton
d3053c0c1b delete_fr_lang 2021-04-28 23:35:47 +02:00
Laurent Destailleur
6f1f26096e Debug partnership module 2021-04-28 23:25:26 +02:00
Anthony Berton
5d17e26738 add_pdf_template_and_read_if_module_activate 2021-04-28 23:25:03 +02:00
stickler-ci
58b4074e57 Fixing style errors. 2021-04-28 21:10:06 +00:00
kastoras
eca04b675b Merge remote-tracking branch 'origin/product_variants_api_add_stock_to_response' into product_variants_api_add_stock_to_response 2021-04-29 00:10:35 +03:00
kastoras
24dec80c7e New/NEW Product Variants API, add variant stock to response by parameter
If $includestock parameter is set to 1, the response will contain variant stock data
2021-04-29 00:06:47 +03:00
Laurent Destailleur
64374f46da Debug v14 2021-04-28 23:01:20 +02:00
Laurent Destailleur
846bab38da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-28 22:45:10 +02:00
Laurent Destailleur
b1d858eb26 Fix translation of new modules 2021-04-28 22:44:57 +02:00
kastoras
e5cd6f97f9 New/NEW Product Variants API, add variant stock to response
When acessing product variants via GET API /products/{id}/variants, Include stock_warehouse data to the response
2021-04-28 23:19:24 +03:00
Anthimidis Nikos
8754b513bd
Merge pull request #1 from Dolibarr/develop
Get latest changes
2021-04-28 23:12:59 +03:00
Laurent Destailleur
9934e28c2a
Merge pull request #17423 from FHenry/dev_new_notif_trigger
Add ORDER_CREATE trigger for notificiation
2021-04-28 21:39:45 +02:00
Laurent Destailleur
887bce8235 Avoid duplicate declaration 2021-04-28 20:59:21 +02:00