Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

7019 Commits

Author SHA1 Message Date
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
Khang
3ae22d0fb3
Merge branch 'Dolibarr:develop' into develop 2022-03-14 11:52:01 +07:00
Laurent Destailleur
ec4ba46582 NEW Add private and public notes on tax files. 2022-03-13 18:30:31 +01:00
Miro Sertić
f22888e426 Add contributor to llx_c_forme_juridique.sql 2022-03-13 14:34:14 +01:00
Miro Sertić
fc59f49b32 Add vat for Croatia 2022-03-13 14:18:14 +01:00
Miro Sertić
339152cf68 Add departments for Croatia 2022-03-13 13:50:11 +01:00
Khang
25d31e38ea Add (llx_c_tva.sql) VIETNAM VAT 2022-03-13 19:15:25 +07:00
Miro Sertić
ba4b72e59d Add regions for Croatia 2022-03-13 13:07:42 +01:00
Miro Sertić
22b3c0ccae Add forme juridique for croatia 2022-03-13 13:04:50 +01:00
UT from dolibit
f808756c3e
Update llx_00_c_country.sql 
Bahreïn  -->  Bahrain
Barbade -->  Barbados
Bénin  -->  Benin
Bermudes  -->  Bermuda 
Bhoutan  -->  Bhutan
Bolivie  -->  Bolivia 
Bosnie-Herzégovine  -->  Bosnia and Herzegovina 
Ile Bouvet  -->  Bouvet Island   (Population: 0 ;-))
Territoire britannique de l''Océan Indien  -->  British Indian Ocean Territory 
Bulgarie  -->  Bulgaria
 2022-03-12 16:34:15 +01:00
UT from dolibit
19b8d418e2
Update 15.0.0-16.0.0.sql 2022-03-12 16:18:09 +01:00
UT from dolibit
7d000e4c9f
Update llx_adherent.sql 2022-03-12 15:57:03 +01:00
stickler-ci
277142dcab Fixing style errors. 2022-03-12 13:53:15 +00:00
UT from dolibit
d36d962d36
Update step2.php 
some english translations at  //comments
 2022-03-12 14:49:54 +01:00
Gauthier PC portable 024
732724ea51 FIX : move all sql stock transfer queries into 15 => 16 migration file 2022-03-10 11:37:52 +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
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
fc139ba9e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 17:22:53 +01:00
Laurent Destailleur
fa46966b81 Fix insert must not include the rowid. 2022-03-07 17:22:29 +01:00
Laurent Destailleur
ce52f8a7ed
Merge pull request #20294 from bloxera/develop 
CLOSE #20292 Include German public holidays
 2022-03-07 17:15:22 +01:00
priojk
db12fe9225 CLOSE #20292 Include German public holidays 
Definition of German public holidays (those which are
only relevant in some areas are marked with --TLW).
The values are configured during the first initial set-up of
Dolibarr.
 2022-03-07 16:38:56 +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
fa707c6015 Fix error from v12 2022-03-07 15:20:55 +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
Laurent Destailleur
c4061e578d Fix field 2022-03-07 15:06:24 +01:00
Laurent Destailleur
028fc4f004 Fix field 2022-03-07 15:05:45 +01:00
Laurent Destailleur
df0b20aad3
Merge pull request #20241 from noec764/12.0_Product_Fournisseur_Migration 
Correction of the modification on the fly of the table llx_product_fournisseur_price
 2022-03-07 15:01:40 +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
Alexandre SPANGARO
13b69bcf93 NEW Dictionaries - add possibility to manage countries in EEC 2022-03-04 07:00:02 +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
0fd56eb56b
Update 15.0.0-16.0.0.sql 2022-03-01 11:09:26 +01:00
Anthony Berton
b9feefad15
Update 14.0.0-15.0.0.sql 2022-03-01 11:08: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
19389ca018
Merge pull request #20200 from ymollard/default-type4tickets 
Set default ticket type to OTHER if no default exists
 2022-02-28 21:03:59 +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
40d67d70d2 Fix module partnership 2022-02-28 12:37:56 +01:00
Laurent Destailleur
32f2eb8c94 Debug v15 2022-02-28 12:13:06 +01:00
Yoan Mollard
4082de422f Set default ticket type to OTHER if no default exists 2022-02-25 16:27:55 +01:00
Anthony Berton
647104cbb6
Update llx_societe.sql 2022-02-25 14:54:21 +01:00
Anthony Berton
24be131600
Update 14.0.0-15.0.0.sql 2022-02-25 14:51:40 +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
Thomas Negre
80d85b4239 db migration: add a column in llx_bank_account to store the expected SEPA format concerning PmtTpInf. 2022-02-23 16:17:18 +01:00
Laurent Destailleur
64ce13e273 Clean setup page 2022-02-23 13:20:14 +01:00
Laurent Destailleur
88f1ae9c13 NEW A module can embed a sql script run at each Dolibarr upgrade 2022-02-23 12:55:15 +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
209ab708d4 FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-22 21:24:34 +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
UT from dolibit
8a0ee772d3
add GitHub 
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'github', 'GitHub', 'https://www.github.com/{socialid}', '', 0);
 2022-02-18 13:10:38 +01:00
Quentin VIAL-GOUTEYRON
879afaa59e NEW : Beginning of PMP management on inventory 2022-02-18 12:16:50 +01:00
Laurent Destailleur
98375d634c
Merge pull request #20055 from Ahuahuachi/fix-20042 
Update Mexican legal entities
 2022-02-17 19:50:47 +01:00
Laurent Destailleur
b393a1277f
Update 14.0.0-15.0.0.sql 2022-02-17 19:50:21 +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
4985b98bd5 Fix tms 2022-02-14 12:02:50 +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
Alfredo Altamirano
88a33c730a
FIX #20042 Update Mexican legal entities 2022-02-11 02:01:25 -06: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
16e4e736fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 16:28:29 +01:00
Laurent Destailleur
535c04e86e Fix region of LIVORNO 2022-02-10 14:18:13 +01:00
Laurent Destailleur
d2af490b33 Fix missing key on a new table 2022-02-10 13:12:00 +01:00
Laurent Destailleur
21f0264683 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:02:48 +01:00
Laurent Destailleur
760b8caa31 Fix migration 2022-02-10 11:26:36 +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
Laurent Destailleur
6ff39da34d
Update 15.0.0-16.0.0.sql 2022-02-10 10:09:05 +01:00
Laurent Destailleur
bfa9986736
Merge pull request #20013 from thomas-Ngr/develop_db_ticket_last_message_date 
New : ticket add last_msg_sent field
 2022-02-07 20:54:26 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +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
5bee821726 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_rec_invoices_15.0_newPR 2022-02-07 14:37:10 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
Laurent Destailleur
fafe41294a Clean install 2022-02-07 14:29:59 +01:00
Laurent Destailleur
31ca78acda Sync transifex. 
Fix install.
 2022-02-07 14:25:20 +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
Laurent Destailleur
7cc06a0ef9 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-02-04 15:40:28 +01:00
Laurent Destailleur
f99e19e729 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 13:19:55 +01:00
Laurent Destailleur
95833135f4 FIX #19974 2022-02-04 10:44:19 +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
Laurent Destailleur
2fea78c90a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2022-01-29 16:48:40 +01:00
Laurent Destailleur
adf8f3886b Merge 2022-01-28 18:07:56 +01:00
Laurent Destailleur
a113231e7b
Merge pull request #19961 from chiariello/develop 
NEW #17123 added ExtraFields for Stock Mouvement
 2022-01-28 18:04:22 +01:00
Laurent Destailleur
32bf4a993d
Merge pull request #19955 from bb2a/patch-1 
FIX - Holiday trigger
 2022-01-28 17:07:59 +01:00
Laurent Destailleur
a631c94193 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-28 15:58:15 +01:00
Laurent Destailleur
ef70777cf1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/reception/card.php
 2022-01-28 15:57:09 +01:00
Salvatore Chiariello
e70604c485 NEW|New #17123 added ExtraFields for Stock Mouvement 2022-01-28 14:57:36 +01:00
Anthony Berton
6fdbda93f8
Update 14.0.0-15.0.0.sql 2022-01-28 02:28:55 +01:00
Anthony Berton
dcb7e39bd2
Update llx_c_action_trigger.sql 2022-01-28 02:27:09 +01:00
Laurent Destailleur
2e525a719d Fix selection of migration script 2022-01-26 19:12:02 +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
13f66df975 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:57 +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
Laurent Destailleur
4b00ddb0b5
Merge pull request #19866 from atm-gauthier/FIX_hrm_divers 
FIX : rankorder + vacant positions
 2022-01-25 14:02:44 +01:00
Anthony Berton
13dbadf770
Update 15.0.0-16.0.0.sql 2022-01-25 00:19:41 +01:00
Anthony Berton
1d265d801a
Update 14.0.0-15.0.0.sql 2022-01-25 00:19:09 +01:00
Anthony Berton
1bd86e4bae
Update 14.0.0-15.0.0.sql 2022-01-25 00:11:04 +01:00
Anthony Berton
b64856807b
Update llx_c_action_trigger.sql 2022-01-25 00:09:41 +01:00
Laurent Destailleur
be01e3b1ac Migration 2022-01-24 14:48:18 +01:00
Laurent Destailleur
38dbaa3d07 Doc 2022-01-24 14:12:27 +01:00
Laurent Destailleur
0e5907e220 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:35 +01:00
Laurent Destailleur
8ceec043e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:10 +01:00
Laurent Destailleur
4d2832e8a0
Merge pull request #19764 from FHenry/dev_BDD_19763 
NEW: #19763 DB change only - Can invoice task time per different services
 2022-01-24 12:28:11 +01:00
Laurent Destailleur
69cd6f0a25 Remove hardcodes list of migration files 2022-01-23 23:37:59 +01:00
Laurent Destailleur
daca510fa6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	build/docker/docker-compose.yml
 2022-01-23 18:52:47 +01:00
Florian HENRY
3063006d61 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_BDD_19763 2022-01-22 18:12:32 +01:00
Laurent Destailleur
a16293f9b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-22 17:27:57 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +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
Cserveny, Tamás
259c94e320 fix docker build setup 2022-01-20 17:57:21 +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
Laurent Destailleur
c2c74f4849 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-19 02:02:52 +01:00
Anthony Berton
f093e01cec
Update 14.0.0-15.0.0.sql 2022-01-18 19:34:18 +01:00
Anthony Berton
16ca2d68b6
Update llx_c_action_trigger.sql 2022-01-18 19:31:51 +01:00
Laurent Destailleur
6276bb77ad Prepare v16 2022-01-18 13:17:59 +01:00
Gauthier PC portable 024
255d8ba753 FIX : rankorder + vacant positions 2022-01-18 10:59:10 +01:00
Laurent Destailleur
63df7ba0d4 Clean code 2022-01-15 21:10:33 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +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
Laurent Destailleur
3a6b5199ec Debug module intracomm 2022-01-08 01:19:04 +01:00
Laurent Destailleur
60b2479389 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
 2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-01-07 15:56:21 +01:00
Laurent Destailleur
451fa396aa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2022-01-07 15:50:30 +01:00
Laurent Destailleur
b23b82bd6f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-01-07 15:49:09 +01:00
Florian HENRY
f5788bef66 OK BDD 2022-01-07 12:20:27 +01:00
Florian HENRY
e87fb1c0dc add column into table inst 2022-01-07 12:19:03 +01:00
daraelmin
1f6e9a1a9e
Fix install - Belgium provinces incorrect mapping 2022-01-04 18:46:29 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
b2c008244e Doc 2021-12-30 19:34:02 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Maxime Kohlhaas
4b3289ed84 Fix #19666 : missing quotes in SQL statement 2021-12-28 16:20:01 +01:00
Maxime Kohlhaas
b54e7bd861 Fix #19691 : wrong table name in sql file 2021-12-28 12:23:15 +01:00
Laurent Destailleur
0fd386a450 css 2021-12-23 11:32:12 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +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
Laurent Destailleur
43e682b56f Fix several pb with down payments 2021-12-16 12:33:45 +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
Frédéric FRANCE
dddeddfe79
check for mbstring extension at install 2021-12-14 22:45:33 +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
eacc5f0f0a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/repair.php
 2021-12-09 18:03:27 +01:00
Laurent Destailleur
783ddcc671 Fix phpcs 2021-12-09 18:01:44 +01:00
Laurent Destailleur
d6ab7ab953 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/install/repair.php
	htdocs/user/class/user.class.php
 2021-12-09 11:15:40 +01:00
Laurent Destailleur
92a0c9e4fb Fix sql error in repair.php 2021-12-09 10:00:42 +01:00
Laurent Destailleur
0e7d23e169 Fix constraint and loading on module activation. 2021-12-07 14:14:13 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
7b68ef1fb8 Clean/Debug module hrm. 2021-11-27 14:46:47 +01:00
Laurent Destailleur
734c9871ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-11-27 01:07:32 +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
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +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
9789ae23d7
Update llx_c_paiement.sql 2021-11-18 20:12:46 +01:00
Laurent Destailleur
2fef57b31f
Merge branch 'develop' into patch-453 2021-11-18 20:12:10 +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
ptibogxiv
336e5628b9
Update 14.0.0-15.0.0.sql 2021-11-15 20:39:39 +01:00
ptibogxiv
d3c7ab5a82
Update llx_c_paiement.sql 2021-11-15 20:38:46 +01:00
ptibogxiv
2625c8fea5
ADD new stripe provider in dictionnary 
For  better informations in Dolibarr and on object/pdf (order, invoice....)
 2021-11-12 17:56:59 +01:00
Laurent Destailleur
0021381201 Fix #yogosha7605 2021-11-11 17:08:35 +01:00
Laurent Destailleur
47dd7335a9 Debug v15 2021-11-10 21:34:41 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
 2021-11-08 03:09:30 +01:00
Laurent Destailleur
cd4f59bb2a FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 03:01:18 +01:00
Laurent Destailleur
e8b3875e2e FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 02:57:21 +01:00
Laurent Destailleur
bbd3293c3c Data ref 2021-11-08 01:42:38 +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
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
f5562177e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-25 13:06:33 +02:00
Laurent Destailleur
98f4f0b1c9 Merge 2021-10-25 11:52:24 +02:00
Laurent Destailleur
4ab759b067 Fix check/uncheck of ping 2021-10-24 14:23:35 +02:00
Laurent Destailleur
ad3297b0ef Use of MAIN_FIRST_PING_OK_ID = 'disabled' works when forcing reinstall. 2021-10-24 14:01:38 +02:00
Laurent Destailleur
44b030e23e
Merge branch 'develop' into NEW_stockstransfers 2021-10-23 22:57:35 +02:00
Laurent Destailleur
404a889910 Fix migration 2021-10-23 12:10:12 +02:00
Laurent Destailleur
ef0b527379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-22 15:57:16 +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
Lucas Marcouiller
75b1518611 Merge branch 'develop' of github.com:Dolibarr/dolibarr into scrutinizerfix 2021-10-22 12:02:33 +02:00
Lucas Marcouiller
33e4d750d7 Fix: scrutinizer errors + boxes activation 2021-10-22 12:01:46 +02:00
Maxime Kohlhaas
75f579c3ad New table element_tag 2021-10-22 00:59:09 +02:00
Nicolas SILOBRE
9630b07b42
Update 14.0.0-15.0.0.sql 2021-10-21 22:49:02 +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
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
8e68f452ed
Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-10-20 14:48:06 +02:00
Regis Houssin
f38fca8174 FIX wrong array key value 2021-10-20 13:35:30 +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
Laurent Destailleur
b9540c3eb6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	ChangeLog
	htdocs/adherents/card.php
	htdocs/filefunc.inc.php
	htdocs/install/repair.php
 2021-10-20 03:38:10 +02:00
atm-florian
d0d5955fb1 FIX 13.0: sometimes firstname was mistyped as fistname 2021-10-18 12:09:33 +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
Alexandre SPANGARO
3a04a0115b Add data sortorder 2021-10-13 03:26:39 +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
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24 
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
 2021-10-11 15:20:27 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Gauthier PC portable 024
fb74d23ae8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-07 13:40:52 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
 2021-10-07 11:00: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
ec545f8967 Fix data 2021-10-07 02:58:51 +02:00
Laurent Destailleur
89b2ecf504 Add missing migration sql 2021-10-06 13:28:05 +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
Laurent Destailleur
8f9a7f4e35
Update 13.0.0-14.0.0.sql 2021-10-06 13:26:42 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +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
Marc de Lima Lucio
b173832d54 NEW: deposit payment terms: add a 30% deposit example payment term at install/migration 2021-10-05 15:42:40 +02:00
Marc de Lima Lucio
6ed9e00b4d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-05 13:35:50 +02:00
Alexandre SPANGARO
2e49eee106 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:52:45 +02:00
Laurent Destailleur
5ad02ccc32 MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut 2021-10-05 09:11:20 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Laurent Destailleur
1c56f65c27 Fix missing migration instruction 2021-10-04 11:49:49 +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
Quentin VIAL-GOUTEYRON
05cd74a64e missing migration file incoterm stocktransfer 2021-10-04 08:46:24 +02:00
Alexandre SPANGARO
94166cdb7e FIX Remove Isle of Man of ECC's countries 2021-10-03 05:36:53 +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
Laurent Destailleur
f479c2bc77
Merge pull request #18868 from frederic34/patch-1 
Fix migration Update 14.0.0-15.0.0.sql
 2021-10-02 20:50:10 +02:00
Laurent Destailleur
55e97784bd FIX #18880 2021-10-02 20:42:54 +02:00
Frédéric FRANCE
87cbc2b555
Update 14.0.0-15.0.0.sql 2021-10-01 08:24:40 +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
78b593c067 FIX: leave request block moved to v15 2021-09-30 17:42:59 +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
3d4bb66853 Clean code 2021-09-30 15:59:47 +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
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Laurent Destailleur
f9913d2ebc
Merge branch 'develop' into develop#4 2021-09-28 13:21:43 +02:00
Laurent Destailleur
bde8ba300a
Merge pull request #18827 from aspangaro/15a21 
NEW #18814 Add legal form for Sweden
 2021-09-28 12:42:35 +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
ec3154075a Comment 2021-09-27 22:16:08 +02:00
Laurent Destailleur
fa57191702 Fix regressions 2021-09-27 20:09:43 +02: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
Alexandre SPANGARO
b7c577b762 NEW #18814 Add legal form for Sweden 2021-09-26 05:17:03 +02:00
Laurent Destailleur
a47cd22450 Fix sql 2021-09-25 21:15:53 +02:00
Laurent Destailleur
efa6e8a408 Fix sql 2021-09-25 21:15:21 +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
Regis Houssin
d91d14d10c FIX init hookmanager after loading $conf values 2021-09-22 12:48:05 +02:00
Laurent Destailleur
b7105d572a Fix delete of invoice not complete (some fk_invoice still filled) 2021-09-21 14:20:01 +02:00