lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

3830 Commits

Author SHA1 Message Date
Laurent Destailleur
81b12c2814
Merge branch 'develop' into Add_notes_to_productlot 2022-09-09 18:02:02 +02:00
lmarcouiller
f22744210e Fix : missing column in etablishement sql 2022-09-09 11:31:06 +02:00
Laurent Destailleur
da0cf1cbf2 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 23:00:10 +02:00
Laurent Destailleur
764e6158eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-08 22:57:50 +02:00
Laurent Destailleur
c3f673c3ad Clean permissions for barcode menu 2022-09-08 14:58:00 +02:00
atm-lena
81ed97e9fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-09-08 11:21:05 +02:00
Laurent Destailleur
c28966864b FIX data integrity for llx_delivery table 2022-09-06 01:42:48 +02:00
Lefteris Kotsonis
20e9dc3f07 [NEW][#22048][Added notes to productlot module] 2022-09-05 16:49:57 +02:00
mikygee
66d42049be Bug #22064 effectif should be 51-100 and 101-500 (not 100-500) 2022-09-04 13:24:23 +02:00
Laurent Destailleur
013bdc5c5f
Update 16.0.0-17.0.0.sql 2022-09-03 11:51:28 +02:00
ptibogxiv
55f8d72219
Update 16.0.0-17.0.0.sql 2022-09-03 10:56:19 +02:00
Laurent Destailleur
3b5f907816
Merge pull request #22006 from frederic34/extrafieldsbankline 
add tables for bank lines extrafields
 2022-09-02 10:16:42 +02:00
Laurent Destailleur
3d9b57ac3f Clean code 2022-09-02 09:35:10 +02:00
Frédéric FRANCE
7374974880 add tables for bank lines extrafields 2022-08-31 18:40:28 +02:00
lmarcouiller
f4ad2d9aa5 Fix : SQL error on 16-17 migration 2022-08-30 11:12:07 +02:00
Laurent Destailleur
11b9314023 Split fk_user_valid that was used for 2 purpose in fk_user_valid/approve 2022-08-29 00:04:12 +02:00
Laurent Destailleur
eeba47b933 Add ip on table llx_adherent (for public submission page) 2022-08-25 12:09:56 +02:00
Laurent Destailleur
4a8b7dbecf Add ip on table of partnership 2022-08-25 12:07:44 +02:00
Laurent Destailleur
d6cc6f2576 Change sql creation of a partnership from a public page 2022-08-25 11:46:44 +02:00
Frédéric FRANCE
a76092707f Merge remote-tracking branch 'upstream/develop' into companybankaccount 2022-08-24 16:22:55 +02:00
Frédéric FRANCE
c53fc449ee add fields for user bank accounts 2022-08-24 16:19:39 +02:00
Frédéric FRANCE
778d245407 add fields for company bank accounts 2022-08-24 16:01:27 +02:00
Laurent Destailleur
03d086f741 NEW Encrypt all sensitive constants in llx_const 2022-08-24 12:22:11 +02:00
atm-lena
6e5d395ac8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-24 11:38:19 +02:00
Laurent Destailleur
b15a4e504e Merge IMAP with phpimap 2022-08-23 22:34:24 +02:00
Laurent Destailleur
4c13b08258 Move state into llx_oauth_token 2022-08-22 22:12:13 +02:00
ptibogxiv
808d5a50f3
Update 16.0.0-17.0.0.sql 2022-08-21 12:58:20 +02:00
Florian Charlaix
c5b43fc7df Add pid integer column to llx_cronjob 
Store the PID of the cronjob to allow cleanup if the process is no longer present in the system
 2022-08-18 15:17:59 +02:00
Faustin
3bf8730c55 New imap by oauth2 works, but somes features left 2022-08-16 17:23:57 +02:00
Laurent Destailleur
d9afdc5846 Missing migration line 2022-08-15 02:27:18 +02:00
UT from dolibit
9a358f43ea
Update 16.0.0-17.0.0.sql 
sort alphabetical
 2022-08-14 13:48:12 +02:00
atm-lena
2fbba30e2a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-11 12:11:41 +02:00
lvessiller
8a910e6cef FIX resolve conflicts 2022-08-10 18:10:17 +02:00
lvessiller
d6494ae484 NEW make sell or eat by mandatory in product lot (SQL) 2022-08-10 17:35:39 +02:00
ptibogxiv
d7e114aa60
Update 16.0.0-17.0.0.sql 2022-08-07 13:00:48 +02:00
ptibogxiv
ed9cadac7e
NEW default_lang for members 2022-08-06 18:47:41 +02:00
Laurent Destailleur
a509ec2c22 Removed bad fields 2022-08-03 18:31:55 +02:00
Laurent Destailleur
b63197fe4a
Merge pull request #21646 from Hystepik/develop#2 
New : Add DoS security on GETPOST with img Yogosha report 11963
 2022-08-03 17:54:13 +02:00
Laurent Destailleur
60fb538bb1 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-03 14:58:31 +02:00
Laurent Destailleur
e0b196f3c2 Fix migration 2022-08-03 14:57:47 +02:00
lmarcouiller
c7652af3bc New : Add DoS security on GETPOST with img 2022-08-03 14:24:27 +02:00
Laurent Destailleur
3f5b3020b0 Add email_date for job applications and tickets 2022-08-02 20:56:48 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
a57c96f6d9
Merge branch 'develop' into dev_add_IMAPport_email_collector 2022-08-02 19:12:44 +02:00
Christophe Battarel
9e963ef0ef fix reappro was very long to display 2022-08-02 18:33:06 +02:00
Laurent Destailleur
628a368686 Add column position for llx_bank 2022-07-31 21:25:24 +02:00
Florian HENRY
454fb6b0f5 new: Add IMAP port setting on email collector module 2022-07-31 13:10:38 +02:00
Laurent Destailleur
51d022914b Fix missing auto increment key. Fix error duplicate of type of contact. 2022-07-29 16:03:21 +02:00
atm-lena
462352b957 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-29 12:06:43 +02:00
Anthony Berton
df727f3b5d FIX - Add colone last_main_doc in societe for migration Error to generate doc 2022-07-28 17:22:21 +02:00
Laurent Destailleur
fc9b3e3d70 Factorize code into a function dolJSToSetRandomPassword() 2022-07-27 13:42:43 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
3eedf18344 Debug v16 2022-07-26 11:53:00 +02:00
Laurent Destailleur
c4eccd262d Add ip into ticket table 2022-07-25 13:15:22 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
 2022-07-24 22:17:25 +02:00
Laurent Destailleur
da8a9e6082
Merge pull request #20625 from Easya-Solutions/new-inventory-category-field 
NEW Can use products categories to make inventory
 2022-07-24 22:06:55 +02:00
Laurent Destailleur
60117bbaee Debug v16 2022-07-24 19:45:37 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
252c581ea6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 11:23:52 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
c7fd9f5a3a Trans 2022-07-24 10:57:46 +02:00
Chl
b4d4c42cfb FIX #20476 discrepancy between MySQL & PostgreSQL default value 2022-07-22 21:10:23 +02:00
Chl
50e1597ef1 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type 2022-07-22 21:09:19 +02:00
Chl
1dec64e320 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type 
Taken from ff35bf8d47
 2022-07-22 19:17:03 +02:00
atm-lena
7f1a17bcc9 Change fk_unit service lines management 2022-07-20 15:38:37 +02:00
lvessiller
8f338d84b0 FIX resolve conflicts 2022-07-15 17:35:19 +02:00
atm-lena
8a36e2e9d8 Màj column fk_fedault_workstatio and duration_unit 2022-07-12 09:21:51 +02:00
Laurent Destailleur
5ba446f736
Merge pull request #21412 from ymollard/membership-rework 
Membership rework
 2022-07-11 12:13:34 +02:00
Laurent Destailleur
5356703f84
Update 16.0.0-17.0.0.sql 2022-07-11 11:38:52 +02:00
Laurent Destailleur
edd2be7cda Fix length of column 2022-07-11 11:32:44 +02:00
Laurent Destailleur
e29df476e6
Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Laurent Destailleur
ae58a77208 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/card.php
 2022-07-11 00:03:39 +02:00
Laurent Destailleur
6386432263 Fix missing migration 2022-07-11 00:01:33 +02:00
Laurent Destailleur
6b07daf40f Fix missing migration 2022-07-10 20:12:56 +02:00
Laurent Destailleur
16d04e475b
Merge branch 'develop' into membership-rework 2022-07-10 18:58:49 +02:00
Laurent Destailleur
bdfa0536a6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-08 14:20:44 +02:00
Laurent Destailleur
3ced3378ac Prepare v17 2022-07-08 14:20:08 +02:00
Laurent Destailleur
245580bfa5 FIX Several pb in invoice remind (html detection, no event, transaction) 2022-07-08 14:11:13 +02:00
Yoan Mollard
07b5657ba1 Merge remote-tracking branch 'origin/develop' into HEAD 2022-07-08 10:11:22 +02:00
Laurent Destailleur
f2a6560d8f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-07 11:45:36 +02:00
Laurent Destailleur
f2961d4bf4 Fix sql 2022-07-07 11:41:40 +02:00
Laurent Destailleur
9af4676369 Fix migration 2022-07-07 11:35:40 +02:00
lvessiller
ed9c7ff251 FIX resolve conflicts 2022-07-06 09:23:44 +02:00
Laurent Destailleur
37db86183c Add field close_missing_amount on invoices 2022-07-05 20:32:26 +02:00
Laurent Destailleur
7e855eac52 Add field close_missing_amount on invoices 2022-07-05 20:22:32 +02:00
Alexandre SPANGARO
32a9e53382 Merge remote-tracking branch 'upstream/develop' into 17p1 2022-07-03 07:29:41 +02:00
Yoan Mollard
5af4e81140 Delay caneditamount feature to v17 2022-07-01 17:39:56 +02:00
Yoan Mollard
1e6df0c6d9 Merge remote-tracking branch 'origin/develop' into membership-rework 2022-07-01 17:38:47 +02:00
Laurent Destailleur
1b5eb2de22
Merge pull request #21411 from defrance/patch-213 
introduce barcode on warehouse place
 2022-07-01 17:24:25 +02:00
Laurent Destailleur
cd2df7caef Debug v16 2022-06-30 12:47:36 +02:00
Laurent Destailleur
7acf02d6da Debug v16 2022-06-30 12:37:41 +02:00
Yoan Mollard
3dcf7db198 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into membership-rework 2022-06-29 16:12:05 +02:00
This Charlène
f6b1c91f21
Update 15.0.0-16.0.0.sql 2022-06-29 14:44:17 +02:00
Yoan Mollard
5998999f18 NEW: Add free membership amounts at the membership type level 2022-06-28 02:33:17 +02:00
Laurent Destailleur
3eec5f0e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-06-27 12:16:17 +02:00
Alexandre SPANGARO
2dd3faa258 NEW Add chart of accounts PCN2020 for Luxemburg 2022-06-26 07:54:45 +02:00
lvessiller
7b7ecf44ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-inventory-category-field 2022-06-24 17:30:14 +02:00
UT from dolibit
924ef0a7db
Update 15.0.0-16.0.0.sql 2022-06-21 19:26:23 +02:00
Laurent Destailleur
eeff8fdc0d Debug v16 2022-06-20 02:10:27 +02:00
lvessiller
d5269cd97b FIX resolve conflicts 2022-06-16 17:08:00 +02:00
Alexandre SPANGARO
86a54d5f22 Merge remote-tracking branch 'upstream/develop' into 16a12_assets_sql 2022-06-15 04:53:55 +02:00
Laurent Destailleur
1deef98f07 Fix length of field 2022-06-09 13:08:12 +02:00
Alexandre SPANGARO
1594a06b95 Merge remote-tracking branch 'upstream/develop' into 17p1 2022-06-09 03:44:21 +02:00
Laurent Destailleur
20b5eb15d3 Fix missing position 2022-06-03 14:02:41 +02:00
Laurent Destailleur
be729ab5f3 Debug v16 2022-06-03 03:10:31 +02:00
Laurent Destailleur
500a81dda1 Clean database 2022-06-03 02:56:25 +02:00
Laurent Destailleur
91a1f97029 Cronjobs ready for future. 2022-06-03 01:42:10 +02:00
Alexandre SPANGARO
19616982c7 Merge remote-tracking branch 'upstream/develop' into 16a12_assets_sql 2022-05-31 11:43:02 +02:00
Laurent Destailleur
571110f60a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-05-25 23:04:58 +02:00
Laurent Destailleur
d0b6daaf4c Fix length of field 2022-05-25 16:50:09 +02:00
Laurent Destailleur
e3aa26e5c2 Fix creation of primary key 2022-05-24 16:10:33 +02:00
Laurent Destailleur
1a23143394 Fix autoincrement column 2022-05-24 16:02:37 +02:00
Laurent Destailleur
d0aef6857c Add missing fields for css on extrafields 2022-05-23 01:02:59 +02:00
Alexandre SPANGARO
709208abfb Merge remote-tracking branch 'upstream/develop' into 16a12_assets_sql 2022-05-22 05:53:23 +02:00
Laurent Destailleur
0f268b682a
Merge pull request #20882 from FHenry/dev_new_add_ref_clinet_intervention 
NEW: Add Customer Ref on Intervention
 2022-05-21 22:36:17 +02:00
Laurent Destailleur
2f6bf5f0c8
Merge pull request #20946 from SylvainLegrand/SylvainLegrand-patch-1 
field ref_customer in llx_expedition is not varchar(255) #20629
 2022-05-21 17:29:46 +02:00
Laurent Destailleur
d51b2f9164 Fix migration 2022-05-21 17:25:38 +02:00
Sylvain Legrand
a65c4c2e05
field ref_customer in llx_expedition is not varchar(255) #20629 2022-05-21 16:05:58 +02:00
Laurent Destailleur
d38b9187f3
Merge branch 'develop' into dev_new_add_ref_clinet_intervention 2022-05-21 10:48:09 +02:00
Alexandre SPANGARO
db522fe685 Merge remote-tracking branch 'upstream/develop' into 16a12_assets_sql 2022-05-21 07:16:45 +02:00
Alexandre SPANGARO
ea8759e627 NEW Add trigger to record the event of sending an email from a project #20912 2022-05-21 07:02:15 +02:00
Laurent Destailleur
c02e3f959f
Merge pull request #20899 from atm-gauthier/NEW/sortorder_on_holiday_type_dictionnary 
New/sortorder on holiday type dictionnary
 2022-05-21 00:43:52 +02:00
Florian HENRY
93831663d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_new_add_ref_clinet_intervention 2022-05-20 10:31:29 +02:00
Gauthier PC portable 024
1e0972f0a1 NEW : sortorder on holiday type dictionnary 2022-05-19 12:34:05 +02:00
Laurent Destailleur
d38697d74b Missing data in resource module 2022-05-19 08:46:50 +02:00
Florian HENRY
2f959306f7 fix travis 2022-05-17 22:50:42 +02:00
Florian HENRY
ada81750c1 NEW: Add Customer Ref on Intervention 2022-05-17 12:53:50 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-09 16:53:53 +02:00
lvessiller
00f321475b NEW replace fk_categories_product with categories_product in inventory 2022-05-09 09:33:44 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
65eb11efdf Fix sql migration 2022-05-08 17:39:53 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2022-05-06 12:46:26 +02:00
lvessiller
ccc4d50a1c FIX resolve conflicts 2022-05-06 09:45:20 +02:00
Laurent Destailleur
e3b777ad5b
Merge pull request #20649 from FHenry/15.0_fix_createtable_without_migration_script 
fix: CREATE TABLE llx_element_tag without migration script
 2022-05-04 17:15:53 +02:00
Laurent Destailleur
3574864062 Add email_company 2022-05-04 15:07:50 +02:00
lvessiller
31d5fe5da3 FIX resolve conflicts 2022-05-04 11:20:24 +02:00
lvessiller
e01f912f41 Resolve conflicts 2022-05-04 11:11:05 +02:00
Laurent Destailleur
5bb2772968 NEW Add firstname and lastname for module "Event Organization" 2022-05-03 18:20:39 +02:00
Laurent Destailleur
16bb5eeb3f NEW Add firstname and lastname for module "Event Organization" 2022-05-03 18:18:11 +02:00
lvessiller
734cdffa59 FIX resolve conflicts 2022-05-02 10:03:23 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
 2022-04-29 17:35:36 +02:00
Laurent Destailleur
e1aaeeef29 FIX #20140 #20301 2022-04-29 16:57:23 +02:00
matll42
ff35bf8d47 FIX #20476 migration postgresql 14.0.x to 15.0.x packaging type 2022-04-29 16:53:48 +02:00
Laurent Destailleur
d496ad65e6 Enhance the feature of keyword detection for partnership 2022-04-29 11:16:15 +02:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
 2022-04-28 19:23:13 +02:00
Laurent Destailleur
fb1c770568 Doc 2022-04-25 23:37:34 +02:00
Laurent Destailleur
307476786c Fix label of remain to pay on vendor invoices 
FIX tool to fix bank account not in main currency for vendor invoice
 2022-04-19 23:24:08 +02:00
Laurent Destailleur
25fbd3b385 Fix missing field 2022-04-16 13:28:38 +02:00
HENRY Florian
9acb1b2f88
Update 14.0.0-15.0.0.sql 2022-04-16 11:14:04 +02:00
Florian HENRY
bed974ebae Merge branch '15.0' of github.com:Dolibarr/dolibarr into 15.0_fix_createtable_without_migration_script 2022-04-15 10:22:33 +02:00
Florian HENRY
24bb6c6f83 fix: clean mess up around element_tag table 2022-04-15 10:20:52 +02:00
lvessiller
c8bec685a9 FIX resolve conflicts 2022-04-15 09:25:13 +02:00
Laurent Destailleur
1fd004d2a7
Merge pull request #20135 from atm-quentin/NEW_inventory_pmp_hidden_conf 
New hidden conf to manage pmp on inventory
 2022-04-14 22:42:35 +02:00
Laurent Destailleur
7636c5109d
Merge pull request #20635 from Hystepik/develop#5 
Fix : add of unique(entity,label) in llx_takepos_floor_tables table
 2022-04-14 21:04:24 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2022-04-14 16:10:23 +02:00
lmarcouiller
c90d758b0f New : add of unique(entity,label) 2022-04-14 11:06:54 +02:00
lvessiller
1cb56adb2e NEW products categories in inventory card 2022-04-13 15:44:27 +02:00
Laurent Destailleur
5e76c1a45d Fix doc 2022-04-12 21:59:34 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Laurent Destailleur
88066d3fca Clean data 2022-04-07 23:53:02 +02:00
Laurent Destailleur
3a2815a9c0 Debug and clean v16 2022-04-07 23:44:57 +02:00
Regis Houssin
35ee6096b6 FIX increased the size of the "note" field 2022-04-07 10:38:46 +02:00
Laurent Destailleur
ed1bdd26db Rename some jobs 2022-04-07 00:09:11 +02:00
Laurent Destailleur
9459971ba4 Removed the awful "group by" on list of invoices. Add index on datef. 2022-04-06 14:53:22 +02:00
Laurent Destailleur
2e5d0ef92b
Merge pull request #20249 from atm-steve/NEW_Employee_management_improvement 
New employee management improvement #18434
 2022-04-05 15:12:19 +02:00
Thomas Negre
35d596e1dc rename constant TICKET_AUTO_CREATE_FICHINTER_CREATE to WORKFLOW_TICKET_CREATE_INTERVENTION 2022-04-04 09:29:03 +02:00
Laurent Destailleur
f1d5695cb0
Merge pull request #20225 from thomas-Ngr/develop_new_ticket_workflow_auto_link_contract 
NEW: add a workflow to auto link contract on a ticket
 2022-04-02 18:15:27 +02:00
Florian HENRY
a9faf5fb54 feat: Add rank column into contract line 2022-04-01 11:29:38 +02:00
Laurent Destailleur
113af78a9c Add column for private widgets 2022-04-01 09:35:45 +02:00
atm-steve
4fa656be96
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
Quentin VIAL-GOUTEYRON
c7e8a2bd8f Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-28 16:04:12 +02:00
Laurent Destailleur
55e414ca30 Fix sql 2022-03-26 16:02:53 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
6177e914e2
Merge pull request #20293 from atm-quentin/NEW_Availibility_dictionary_field 
NEW Availibility dictionnary new column unit and number
 2022-03-24 20:28:38 +01:00
Laurent Destailleur
27d8691fcc Use default to null 2022-03-24 12:30:26 +01:00
BENKE Charlene
fcc8a953ae
Update 15.0.0-16.0.0.sql 2022-03-23 16:51:36 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ef21def5ce NEW Add option MAIN_API_DEBUG to save API logs into a file 2022-03-19 10:42:06 +01:00
Laurent Destailleur
876a013ded Fix migration 2022-03-17 19:09:58 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
 2022-03-17 19:00:19 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Thomas Negre
90ab7da40d Workflow : sort contracts when automatic linking to ticket. 
Introduces constants TICKET_PRODUCT_CATEGORY and WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS.
Rename constant TICKET_AUTO_ASSIGN_CONTRACT_CREATE to WORKFLOW_TICKET_LINK_CONTRACT.
 2022-03-17 16:05:35 +01:00
Quentin VIAL-GOUTEYRON
4aa87f3f85 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-17 11:37:19 +01:00
Laurent Destailleur
92f82c7474
Merge pull request #20337 from dolibit-ut/patch-379 
Update 15.0.0-16.0.0.sql
 2022-03-15 19:48:21 +01:00
atm-steve
21090963e0
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-14 17:03:52 +01:00
Laurent Destailleur
ec4ba46582 NEW Add private and public notes on tax files. 2022-03-13 18:30:31 +01:00
UT from dolibit
19b8d418e2
Update 15.0.0-16.0.0.sql 2022-03-12 16:18:09 +01:00
Quentin VIAL-GOUTEYRON
7ae96b9839 convert number into qty 2022-03-09 10:34:23 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
161edea6f3 FIX: deposit payment terms: adapt to v16 2022-03-08 15:22:19 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Quentin VIAL-GOUTEYRON
b904ea73a6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-08 08:55:21 +01:00
Quentin VIAL-GOUTEYRON
44577b2d1a fix remove delete and add update lxx c availability 2022-03-08 08:51:31 +01:00
Quentin VIAL-GOUTEYRON
771fa0b6ed Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-08 08:50:22 +01:00
Laurent Destailleur
6d772b7627
Merge branch 'develop' into patch-1 2022-03-07 16:08:31 +01:00
Quentin VIAL-GOUTEYRON
af8ecd1a38 NEW Availibility dictionnary column unit and number 2022-03-07 16:02:49 +01:00