Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 13:01:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

7539 Commits

Author SHA1 Message Date
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
47acdc8f34 Fix database corruption without that. 2022-03-18 14:10:42 +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
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
ef19769249 Merge pull request #20318 from Achicken7301/develop 
Vietnam date format, VAT rates
 2022-03-16 22:22:20 +01:00
Laurent Destailleur
9c8ac4e145 Merge pull request #20334 from dolibit-ut/patch-376 
Update step2.php
 2022-03-16 22:08:57 +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
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
Laurent Destailleur
09a60e7ecb Merge pull request #20338 from dolibit-ut/patch-380 
Update llx_00_c_country.sql
 2022-03-15 19:46:49 +01:00
Laurent Destailleur
306b58443c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-03-15 19:44:34 +01:00
Laurent Destailleur
f885781919 Merge branch 'croatian_install_data' of https://github.com/mps-it/dolibarr into mps-it-croatian_install_data 2022-03-15 19:42:14 +01:00
Laurent Destailleur
98dfea0443 Merge pull request #20363 from dolibit-ut/patch-382 
Update llx_c_hrm_public_holiday.sql
 2022-03-15 19:36:19 +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
271857189c Update llx_20_c_departements.sql 2022-03-15 13:29:34 +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
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