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

2729 Commits

Author SHA1 Message Date
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
Laurent Destailleur
8661902bfa
Update llx_holiday.sql 2022-03-24 12:26:31 +01:00
Laurent Destailleur
d952419fac
Update llx_holiday.sql 2022-03-24 12:25:42 +01:00
BENKE Charlene
95c8dfcaa0
Update llx_holiday.sql 2022-03-23 16:53:12 +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
47acdc8f34 Fix database corruption without that. 2022-03-18 14:10:42 +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
Quentin VIAL-GOUTEYRON
5bd2951cbd fix char into varchar 2022-03-17 11:38:42 +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
79dbfac4ec
Merge pull request #20336 from dolibit-ut/patch-378 
Update llx_adherent.sql
 2022-03-16 22:03:42 +01:00
UT from dolibit
64525349e0
Update llx_c_hrm_public_holiday.sql 
add  fk_departement
see #16646
 2022-03-15 13:46:14 +01:00
UT from dolibit
0766355cba
Update llx_adherent.sql 
add state -2
 2022-03-15 11:04:56 +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
7d000e4c9f
Update llx_adherent.sql 2022-03-12 15:57:03 +01:00
Gauthier PC portable 024
db7bd84ec3 FIX : tms without DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP 2022-03-10 11:29:53 +01:00
Gauthier PC portable 024
96f78adb92 FIX : travis feedback, tms without "DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" 2022-03-10 11:07:00 +01:00
Gauthier PC portable 024
c103c7d61e Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-03-10 10:31:56 +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
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
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
Laurent Destailleur
84b951c2f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-07 15:24:08 +01:00
Laurent Destailleur
c4a20685a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:38 +01:00
Laurent Destailleur
c0088191f1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
 2022-03-07 15:19:51 +01:00
Laurent Destailleur
d13ae9f721 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
 2022-03-07 15:13:25 +01:00
Quentin VIAL-GOUTEYRON
cc591b3a03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-07 10:12:17 +01:00
Alexandre SPANGARO
1671b095eb Fix also table llx_c_country 2022-03-04 07:02:40 +01:00
Steve
cb17f2029e wip: add ref_employee and national_registration_number fields 2022-03-02 11:20:07 +01:00
Noé Courtier
035bc32323 Correction of the modification on the fly of the table llx_product_fournisseur_price by an addition in the script creation of the table as well as in the script of version upgrade from 12 ->13 2022-03-01 16:14:31 +01:00
Anthony Berton
eb90beaebe
Merge branch 'develop' into patch-1 2022-03-01 11:07:11 +01:00
Laurent Destailleur
ef39c50882
Merge branch '15.0' into patch-1 2022-02-28 21:09:50 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
32f2eb8c94 Debug v15 2022-02-28 12:13:06 +01:00
Anthony Berton
647104cbb6
Update llx_societe.sql 2022-02-25 14:54:21 +01:00
Laurent Destailleur
4f054481d9
Merge branch 'develop' into 16a12 2022-02-25 14:15:08 +01:00
Thomas Negre
2d74e4fce1 add field pti_in_ctti in bank_account table description. Change column type to smallint. 2022-02-24 09:30:55 +01:00
Alexandre SPANGARO
7f29668c62 Increase the length of the ref_supplier field 2022-02-23 06:43:01 +01:00
Laurent Destailleur
c7c0c75429 Clean code 2022-02-22 22:27:09 +01:00
Laurent Destailleur
c63e2c2981 Website tables are created only if module enabled. 2022-02-22 19:15:37 +01:00
atm-lena
2e02b3fcae Ajout table "llx_inventory_extrafields" 2022-02-21 14:58:47 +01:00
Quentin VIAL-GOUTEYRON
595a6c2782 new pmp column 2022-02-21 14:25:18 +01:00
Quentin VIAL-GOUTEYRON
879afaa59e NEW : Beginning of PMP management on inventory 2022-02-18 12:16:50 +01:00
Laurent Destailleur
c20d824999 Tables of module ticket are create only when module is enabled. 2022-02-17 19:30:18 +01:00
Laurent Destailleur
68beafe599 Removed useless indexes 2022-02-17 19:24:44 +01:00
Adrien Raze
562c3cf958 FIX : There's no field "ref" in llx_facture_fourn_rec table 2022-02-14 14:15:38 +01:00
Alexandre SPANGARO
b7b3a25aba Fix tms 2022-02-14 11:23:03 +01:00
Alexandre SPANGARO
636a01725e Remove integer(1) 2022-02-14 04:11:11 +01:00
Alexandre SPANGARO
5152a060cc NEW Asset module - New structure 2022-02-14 04:06:25 +01:00
Laurent Destailleur
52bacbd914 Tables for emailing and asset modules are loaded on module activation 2022-02-10 19:21:15 +01:00
Laurent Destailleur
3bc064ac55 Add status on tasks 2022-02-10 19:08:35 +01:00
Laurent Destailleur
4da2056021 Doc 2022-02-10 19:05:05 +01:00
Laurent Destailleur
d2af490b33 Fix missing key on a new table 2022-02-10 13:12:00 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-10 11:25:15 +01:00
Laurent Destailleur
9412bcdba0
Merge pull request #20009 from OPEN-DSI/new_variants_remake_sql2 
NEW: Update variants to standard card and list (SQL)
 2022-02-10 11:03:32 +01:00
Laurent Destailleur
06fe8c391e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/install/mysql/tables/llx_propaldet.sql
 2022-02-10 10:23:42 +01:00
Laurent Destailleur
77f1649adf
Merge pull request #20012 from atm-adrien/NEW_rec_invoices_15.0_newPR 
NEW Recurring vendor invoices
 2022-02-10 10:09:47 +01:00
Thomas Negre
b21fdbb21e add a field date_last_msg_sent in ticket.sql install file 
modify migration script
 2022-02-07 15:19:13 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
kamel
75653395fd NEW: Update variants to standard card and list (SQL) 2022-02-07 10:12:41 +01:00
Alexandre SPANGARO
3e4150fbc2 Translation 2022-02-07 05:02:59 +01:00
Alexandre SPANGARO
ea83b9c11c FIX Propal - Missing field import_key in import propal line 2022-02-06 13:56:57 +01:00
Laurent Destailleur
c63ebfde29 Tables are loaded on module activation 2022-02-06 13:16:32 +01:00
Laurent Destailleur
86da9c610e
Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance 
NEW: leave requests: add field into type dictionary to block request if balance is negative
 2022-02-04 20:23:04 +01:00
Laurent Destailleur
20ddd04d14 Make around 15 tables not created by default but at first module init. 2022-02-04 20:06:09 +01:00
atm-lena
d6ff551702 Add column "fk_parent_line" to llx_mrp_mo 2022-02-02 15:15:22 +01:00
ksar
0d534f0c37
FIX #19974 : llx_onlinesignature.sql allready exist 
FIX #19974 : llx_onlinesignature.sql allready exist
 2022-02-02 10:56:32 +01:00
Salvatore Chiariello
e70604c485 NEW|New #17123 added ExtraFields for Stock Mouvement 2022-01-28 14:57:36 +01:00
Juanjo Menent
56cb81287e Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760 
# Conflicts:
#	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
 2022-01-25 16:25:44 +01:00
Laurent Destailleur
c3a58ae303 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:42 +01:00
Juanjo Menent
0fb9e9c988 Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760 
# Conflicts:
#	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
 2022-01-21 12:42:51 +01:00
Florian HENRY
8141e3e460 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_BDD_19763 2022-01-19 13:30:39 +01:00
Gauthier PC portable 024
255d8ba753 FIX : rankorder + vacant positions 2022-01-18 10:59:10 +01:00
Laurent Destailleur
00108589fd Fix creation of fields tms into sql scripts 2022-01-11 01:00:31 +01:00
Laurent Destailleur
cfec02aaae Debug v15 2022-01-10 14:27:43 +01:00
Juanjo Menent
840b0e4843 FIX #19760 Uniformize label length 2022-01-08 14:47:40 +01:00
Florian HENRY
e87fb1c0dc add column into table inst 2022-01-07 12:19:03 +01:00
Laurent Destailleur
b2c008244e Doc 2021-12-30 19:34:02 +01:00
Maxime Kohlhaas
b54e7bd861 Fix #19691 : wrong table name in sql file 2021-12-28 12:23:15 +01:00
Laurent Destailleur
7952207474 Comment 2021-12-18 23:56:45 +01:00
Laurent Destailleur
fcb10df570 Fix size of origintype 2021-12-17 09:54:03 +01:00
Laurent Destailleur
494e9a2745
Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-12-16 19:12:06 +01:00
Laurent Destailleur
517355972a Fix duplicate table for online signature 2021-12-16 19:01:11 +01:00
Adrien Raze
9f7e8fa3ed NEW : Creation of the llx_facture_fourn_rec.sql table for recurring supplier invoices 2021-12-15 15:19:12 +01:00
Laurent Destailleur
3abb3f5018 Debug inventory feature 2021-12-12 00:05:31 +01:00
Laurent Destailleur
8cdc5726a0 Fix column length 2021-12-10 10:26:20 +01:00
Laurent Destailleur
0e7d23e169 Fix constraint and loading on module activation. 2021-12-07 14:14:13 +01:00
Laurent Destailleur
7b68ef1fb8 Clean/Debug module hrm. 2021-11-27 14:46:47 +01:00
Gauthier PC portable 024
641002ae96 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-11-24 09:05:24 +01:00
Laurent Destailleur
dc5a1ceb28 FIX size of field multicurrency_code (contains the 3 char ISO code) 2021-11-22 03:12:40 +01:00
Laurent Destailleur
863a7d4d02 Fix bad column name 2021-11-22 02:50:54 +01:00
Marc de Lima Lucio
bffd2fc939 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-11-19 16:12:33 +01:00
Laurent Destailleur
9b9b63c794 Prepare database for future 2021-11-18 10:20:05 +01:00
Laurent Destailleur
e549afe50a Prepare database 2021-11-17 01:07:56 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
2234522519 Debug module parnership. Add the type of partnership. 2021-11-07 13:51:31 +01:00
Laurent Destailleur
09d9d1ac42 Add missing unique key 2021-11-07 12:38:44 +01:00
Maxime Kohlhaas
3508aa92d6 Fix : uk and index on element_tag table 2021-11-01 10:24:19 +01:00
Maxime Kohlhaas
8858b2ba55 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_element_tag_table 2021-11-01 10:06:42 +01:00
Laurent Destailleur
3e46d58129 FIX Type of field progression in ticket must be integer 2021-11-01 03:14:54 +01:00
Frédéric FRANCE
9a68a97fc6
replace commentaire_abandon by abort_comment 2021-10-31 21:18:59 +01:00
Frédéric FRANCE
bc972554c6
replace reseved word rank 2021-10-31 21:13:15 +01:00
Maxime Kohlhaas
d4107fcc4e Fix wrong column name 2021-10-31 16:14:13 +01:00
Maxime Kohlhaas
9bc419f2dd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_element_tag_table 2021-10-31 09:19:48 +01:00
Marc de Lima Lucio
fbb1fbf08e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-10-28 17:09:50 +02:00
Marc de Lima Lucio
7e059c0a22 NEW: deposit payment terms: futureproof evolutions by storing field as a string 2021-10-28 16:53:28 +02:00
Marc de Lima Lucio
668088a63f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-28 15:54:18 +02:00
Laurent Destailleur
97d97af932 Clean: Remove fields for social networks (merged into "socialnetworks") 2021-10-27 16:39:34 +02:00
Laurent Destailleur
98f4f0b1c9 Merge 2021-10-25 11:52:24 +02:00
Laurent Destailleur
44b030e23e
Merge branch 'develop' into NEW_stockstransfers 2021-10-23 22:57:35 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Maxime Kohlhaas
75f579c3ad New table element_tag 2021-10-22 00:59:09 +02:00
Nicolas SILOBRE
09c8b96696
Fix can't generate pdf last_main_doc 2021-10-21 22:44:57 +02:00
Regis Houssin
3029804db7 FIX compatibility with Multicompany 2021-10-20 19:21:18 +02:00
Laurent Destailleur
8e68f452ed
Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-10-20 14:48:06 +02:00
Laurent Destailleur
e4d0bf7a91
Merge pull request #18967 from aspangaro/15a23 
NEW Add sortorder on units list
 2021-10-20 12:50:32 +02:00
Gauthier PC portable 024
4614b0dd65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-20 09:13:58 +02:00
Florian HENRY
5f4410468d add filed budget in task 2021-10-15 10:24:56 +02:00
Marc de Lima Lucio
29768a1c6e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-13 11:33:04 +02:00
Alexandre SPANGARO
41d6a96342 Merge remote-tracking branch 'upstream/develop' into 15a23 2021-10-13 03:29:57 +02:00
Gauthier PC portable 024
ca18db8f50 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-11 16:01:47 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +02:00
Gauthier PC portable 024
70648477a7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-07 10:37:09 +02:00
Alexandre SPANGARO
24e3dd0992 Prepare sql 2021-10-07 06:05:36 +02:00
Laurent Destailleur
0cf18ded80
Merge pull request #18866 from marc-dll/14.0_FIX_holiday_increments_pgsql 
FIX: postgresql compatibility with camelcase fields
 2021-10-06 13:26:57 +02:00
Marc de Lima Lucio
fdb6ebe80e FIX: postgresql: rename the oly column with uppercase characters to lowercase 2021-10-05 16:18:56 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Gauthier PC portable 024
73e741ca74 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-04 11:10:38 +02:00
Laurent Destailleur
2f813e0b6a
Merge pull request #18832 from atm-gauthier/NEW/integration_GPEC_sql 
NEW : integration HRM sql and migration files
 2021-10-02 21:18:50 +02:00
Gauthier PC portable 024
433132de9a FIX : llx_hrm_position > llx_hrm_job_user 2021-10-01 07:49:31 +02:00
Marc de Lima Lucio
5f826f78a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-09-30 17:41:38 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Laurent Destailleur
11c48a53a5 Fix name of file 2021-09-29 17:20:59 +02:00
Quentin VIAL-GOUTEYRON
8de4d3d1a4 NEW incoterms 2021-09-29 16:56:57 +02:00
Marc de Lima Lucio
ab48351d15 NEW: deposit payment terms: database fields 2021-09-29 11:10:58 +02:00
Gauthier PC portable 024
419ff967e3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_sql 2021-09-29 07:52:13 +02:00
Laurent Destailleur
f9913d2ebc
Merge branch 'develop' into develop#4 2021-09-28 13:21:43 +02:00
Laurent Destailleur
6b80afa4d1
Merge pull request #18837 from habibulilalbaab/patch-1 
Bug Query llx_categorie_knowledgemanagement.sql
 2021-09-28 12:10:35 +02:00
Muhammad Habib Ulil A
c857dc1904
Update llx_product.sql 2021-09-28 07:52:12 +07:00
Muhammad Habib Ulil A
ef7d3ec72d
Update llx_categorie_knowledgemanagement.sql 2021-09-28 07:44:26 +07:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Gauthier PC portable 024
07bdc534db NEW : integration HRM sql and migrations files 2021-09-27 10:34:31 +02:00
Laurent Destailleur
567334318a Fix sql eventorganization 2021-09-25 21:13:55 +02:00
Laurent Destailleur
dc36724a10 FIX #18805 2021-09-24 13:51:52 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
lmarcouiller
7361941420 Close #18770 : Can enter buying price on line 2021-09-22 14:56:44 +02:00
Laurent Destailleur
b7105d572a Fix delete of invoice not complete (some fk_invoice still filled) 2021-09-21 14:20:01 +02:00
Laurent Destailleur
66e58004fb Add column max_attendees for an event 2021-09-18 11:10:00 +02:00
Gauthier PC portable 024
e6c9627195 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-17 15:47:23 +02:00
Laurent Destailleur
fdcd523c55
Merge branch 'develop' into develop#1 2021-09-17 11:59:20 +02:00
Laurent Destailleur
a0681d460d
Update llx_product_lot.sql 2021-09-17 11:47:42 +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
lmarcouiller
977fa99681 update knowledgemanagement.key name 2021-09-13 11:39:08 +02:00
lmarcouiller
4762fd9c2e Close #18678 : Implemention of tags/categories KM 2021-09-13 11:22:55 +02:00
Laurent Destailleur
5a87d94b3c Add missing fields into llx_holiday 2021-09-09 20:38:25 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
ca2aa6d031 Clean comment 2021-09-09 04:37:08 +02:00
Gauthier PC portable 024
d121544810 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-06 16:08:39 +02:00
Gauthier PC portable 024
be1c08ddfe FIX : salary extrafields don't work and table is not well named 2021-09-06 12:30:39 +02:00
jpb
06b9f90383 merge conflict 2021-09-06 09:52:28 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
ptibogxiv
885237f3ac
Update llx_knowledgemanagement_knowledgerecord.sql 2021-09-04 19:32:15 +02:00
Laurent Destailleur
138af805b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-04 14:11:38 +02:00
Florian HENRY
96f9f8ae98 work on event 2021-09-03 15:40:33 +02:00
Laurent Destailleur
cd313d7506 Save type (manufacture/disassemble) on MO. 2021-09-02 15:23:31 +02:00
Laurent Destailleur
3b236f677d
Update llx_product_association.sql 2021-09-01 16:31:16 +02:00
Adrien Raze
317876eb0c NEW : Update SQL : install and migration 2021-08-30 15:48:22 +02:00
Gauthier PC portable 024
c56c74bbdd Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-08-18 18:31:11 +02:00
jpb
fcd485f614 merge conflict 2021-08-18 09:16:28 +02:00
Laurent Destailleur
3bc8a7345c
Merge branch 'develop' into develop#1 2021-08-18 00:37:23 +02:00
jpb
b1cba14718 merge conflict 2021-08-12 09:36:34 +02:00
Laurent Destailleur
c36bb0fbf7
Merge branch 'develop' into patch-163 2021-08-11 21:43:42 +02:00
Laurent Destailleur
9e54dc0dcb typo 2021-08-11 21:31:14 +02:00
Laurent Destailleur
591b4c6793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-09 16:49:16 +02:00
Laurent Destailleur
739d8e1c6b Fix data structure 2021-08-09 16:19:23 +02:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Hystepik
e02d93c401
Merge branch 'develop' into develop#1 2021-08-04 16:15:50 +02:00
Laurent Destailleur
ea6cfeb0e8 NEW Increase size of params of action for emailcollector 2021-08-03 19:21:18 +02:00
Gauthier PC portable 024
ee52fc162c FIX : tms on update current timestamp + wrong links 2021-08-03 16:36:27 +02:00
Gauthier PC portable 024
b83b77beb5 NEW : stock transfer sheet proforma + default model system like cmd invoice, etc... 2021-08-02 17:28:41 +02:00
Gauthier PC portable 024
a45bab10bd Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-08-02 10:09:18 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
jpb
15578c2ec2 merge conflict 2021-07-30 10:57:04 +02:00
Gauthier PC portable 024
6d460d78ca NEW : Stocks transfers objects management 2021-07-29 16:09:07 +02:00
ksar
3e3751e161
Add url field 
#18212
 2021-07-27 22:13:19 +02:00
Florian HENRY
f4fd4d8e7d new: ref fourn and ref customer same size as ref product 2021-07-27 12:09:04 +02:00
jpb
97287af987 add field to object product, add sql 2021-07-19 14:03:03 +02:00
lmarcouiller
1fb99a3185 Update to match eldy changes 2021-07-16 15:47:17 +02:00
Laurent Destailleur
0ccc2d9033 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-16 15:01:11 +02:00
Laurent Destailleur
501bc853af Fix default value 2021-07-16 12:44:15 +02:00
lmarcouiller
f68f98cbdd New : language support for knowledgemanagement module 2021-07-16 09:59:15 +02:00
Laurent Destailleur
0d12f25341 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:21:50 +02:00
Laurent Destailleur
d1a00c26aa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/functions.lib.php
 2021-07-13 13:14:27 +02:00
Laurent Destailleur
7a589921fe Fix #18142 2021-07-13 13:10:19 +02:00
Laurent Destailleur
6f4090f567
Merge pull request #18127 from evarisk-theo/add-ticket-categories-data-model 
add: ticket categories data model
 2021-07-12 13:19:47 +02:00
evarisk-theo
8496c9e57f
Merge branch 'Dolibarr:develop' into add-ticket-categories-data-model 2021-07-12 09:09:53 +02:00
Laurent Destailleur
41016039b6 Fix missing very old table 2021-07-11 19:39:18 +02:00
Laurent Destailleur
ab030936c3 Fix missing commit on tables 2021-07-11 19:15:16 +02:00
Laurent Destailleur
032b44996c Debug v14 2021-07-11 19:09:51 +02:00
Laurent Destailleur
802ac58f9a Clean v14 2021-07-11 18:56:15 +02:00
Laurent Destailleur
87241c94a3 Code comment 2021-07-05 14:41:40 +02:00
Théo David
de847250b1 NEW #18046 Add ticket categories data model 2021-07-01 17:55:54 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
5697e86c09 Fix columns for export/import profile 2021-06-21 14:12:33 +02:00
Laurent Destailleur
3754c2c3c9 Fix name of field 2021-06-17 00:59:11 +02:00
Laurent Destailleur
d04fe12ce9 # WARNING: head commit changed in the meantime 
Clean code
 2021-06-14 15:05:54 +02:00
Marc de Lima Lucio
30e0471451 NEW: leave requests: add field into type dictionary to block request if balance is negative 2021-06-10 23:04:56 +02:00
Laurent Destailleur
9f177a0c63 Debug v14 2021-06-06 16:36:41 +02:00
Laurent Destailleur
34955b1cf9 Fix sql 2021-06-04 12:48:18 +02:00
Laurent Destailleur
4d42235670 Complete experimental module knowledge management 2021-05-18 20:46:14 +02:00
Laurent Destailleur
9a8bd2c24b Add missing field 
Fix duplicate / in url
 2021-05-17 06:13:26 +02:00
Laurent Destailleur
5e0f2f9781 Debug v14. Fix regression. 2021-05-12 22:35:21 +02:00
Laurent Destailleur
3ea6cd1c66 Fix missing columns 2021-05-12 08:53:29 +02:00
Laurent Destailleur
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +02:00
lmarcouiller
209682e710 Fix #17361 : changes into mysql/tables of export_model 2021-05-05 11:30:13 +02:00
Laurent Destailleur
d6617f82ca
Merge branch 'develop' into develop 2021-05-04 00:23:28 +02:00
Laurent Destailleur
03e8f2aee1 Fix for performance troubles 2021-05-03 18:49:37 +02:00
Laurent Destailleur
28b1d83ae9 Make some performance enhancements 2021-05-03 18:29:21 +02:00
daraelmin
8457fef1a2
Update llx_adherent_type.sql 2021-05-01 20:10:17 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +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
lmarcouiller
6da32015f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-04-29 09:45:30 +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
lmarcouiller
97043ca665 New module KnowledgeManagement 2021-04-28 14:57:49 +02:00
Gauthier PC portable 024
4af2f8871a FIX : on update current_timestamp 2021-04-28 12:27:07 +02:00
kamel
3a673c9210 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007 2021-04-27 12:29:10 +02:00
kamel
9c46b234cf FIX Supplier invoices (deposit, multicurency in lines) 2021-04-26 17:43:27 +02:00
Indelog
eb52f5daa0 Add : register donation payment when public payment 
- When we paid a donation whit public link, create the associated payment and
  put its status to payed if all the promised amount is it.

- Set the amount to pay on public page depending to the rest to pay for
  the don.
 2021-04-22 16:32:05 +02:00
altairis-noe
07cd751c59 batch status dictionnary 2021-04-20 15:51:02 +02:00
Laurent Destailleur
891de3350f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-20 13:30:43 +02:00
Laurent Destailleur
4180a9ef62 FIX pb when saving some export profiles 2021-04-20 13:30:18 +02:00
Laurent Destailleur
8e2cc43eb1 Clean code 2021-04-15 19:19:58 +02:00
Laurent Destailleur
f2bd030f91 Clean code 2021-04-15 19:14:43 +02:00
Anthony Berton
7137b3ddcc Update llx_societe.sql 2021-04-14 11:49:37 +02:00
Laurent Destailleur
1bae707246 Prepare table for future enhancement 2021-04-13 11:38:37 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer 
new: working on conference or booth object and event type #FoundationFunding
 2021-04-12 16:06:13 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Dorian Vabre
b3415f9031 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-09 16:23:42 +02:00
Dorian Vabre
a99dd2be35 new: add attendees public registration page 2021-04-09 16:20:12 +02:00
Christophe Battarel
4f413ca983 add fk_project to warehouse table 2021-04-08 16:46:52 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35 
NEW: Add deposit on supplier invoice (& somes ajustments)
 2021-04-07 02:51:32 +02:00
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
cbbaecd100 Merge branch 'pr_batch_mask' of https://github.com/altairisfr/dolibarr 
into altairisfr-pr_batch_mask

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-04-02 22:49:49 +02:00
Laurent Destailleur
0a03ee5cd4 Comment 2021-04-02 15:44:06 +02:00
Christophe Battarel
0adbffd864 fix typo 2021-04-02 08:24:10 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Laurent Destailleur
cdd3e385e7 Merge branch 'new-propal-signature-date-and-user' of 
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-new-propal-signature-date-and-user

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-03-30 19:34:25 +02:00
Laurent Destailleur
c80a8517d4 Fix position of line for ticket group 2021-03-30 17:39:48 +02:00
lvessiller
85fff685db Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:19:54 +02:00
UT from dolibit
f46dadcd89
Update llx_holiday_extrafields.sql 
LICENSE 
https
 2021-03-29 22:12:09 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Florian HENRY
11dcf656c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 20:30:31 +02:00
Florian HENRY
1f08e37a03 more feature 2021-03-29 20:28:29 +02:00
Christophe Battarel
bbc263f4b3 llx_product batch_mask definition 2021-03-29 18:39:22 +02:00
Florian HENRY
14a90a3a9d on goung 2021-03-29 17:26:43 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Alexandre SPANGARO
22f809c517 Move to _PERENTITY 2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-27 05:02:55 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
lvessiller
8a2e49d6e7 NEW date and user signature on proposal (Issue 16062) 2021-03-26 17:44:41 +01:00
Florian HENRY
e898fbb834 almost done 2021-03-24 21:21:53 +01:00
Florian HENRY
373a52063d add commit 2021-03-24 20:13:30 +01:00
Laurent Destailleur
37c04b794f Add property "ticket group is public" in dicitonary of ticket groups. 2021-03-24 12:13:23 +01:00
Alexandre SPANGARO
0c2ada4299 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-21 23:08:01 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Laurent Destailleur
7b7db14473 Fix regression 2021-03-20 11:23:32 +01:00
Alexandre SPANGARO
0b23ea072b FIX SQL Error on fresh install 2021-03-20 08:15:16 +01:00
Alexandre SPANGARO
74c4f97040 FIX SQL Error on fresh install 2021-03-20 08:15:05 +01:00
Alexandre SPANGARO
18d247026d NEW: Add a sub table to manage product/societe 2021-03-18 17:08:55 +01:00
Laurent Destailleur
8d19c57731 Add fields to know authentication method used 2021-03-18 12:54:49 +01:00
Alexandre SPANGARO
6e17a588bb Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-16 03:26:28 +01:00
Laurent Destailleur
2129adf129 Add more fields to llx_oauth_token 2021-03-15 13:25:08 +01:00
ksar
429992ee7f FIX #16590 2021-03-09 10:46:11 +01:00
Laurent Destailleur
c483ad5dda
Merge branch 'develop' into develop 2021-03-06 11:25:52 +01:00
Laurent Destailleur
7a193b4c87 Add index on tag. Reduce tag length 2021-03-05 14:53:13 +01:00
Laurent Destailleur
b92bfb007f
Merge pull request #16520 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-04 17:06:57 +01:00
Florian HENRY
ecd1915c0a fix sql 2021-03-04 07:45:27 +01:00
Florian HENRY
879e8fe5f6 fix sql 2021-03-04 07:44:00 +01:00
Florian HENRY
e5e3abd685 class conference or booth or and table actioncomm ok 2021-03-02 22:23:54 +01:00
Florian HENRY
0f51072222 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-03-02 11:01:02 +01:00
Florian HENRY
17c8a32780 fix civility createion PK 2021-03-02 11:00:16 +01:00
Florian HENRY
b5fd3e4984 on going 2021-03-01 17:06:03 +01:00
Florian HENRY
036d1d5802 change comlumn name 2021-03-01 15:36:22 +01:00
Florian HENRY
e101ff0d6d change comlumn name 2021-03-01 15:34:02 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Alexandre SPANGARO
ca7958f273 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-02-28 07:32:23 +01:00
Florian HENRY
5221b59539 set correct field name as conference or booth are in actioncomm table 2021-02-27 15:34:28 +01:00