Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 10:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
119,263 Commits 36 Branches 190 Tags
2b4f4e9e4ace8b51e8ed5bc67b5c60fbc7fca40c
Commit Graph

2695 Commits

Author SHA1 Message Date
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
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
9459971ba4 Removed the awful "group by" on list of invoices. Add index on datef. 2022-04-06 14:53:22 +02:00
Laurent Destailleur
f9c9e518c3 Load tables for opensurvey only when module opensurvey is enabled 2022-04-05 19:14:00 +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
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
Laurent Destailleur
bbcfc4b9f9 Fix condition on table creation 2022-03-31 16:39:36 +02:00
Laurent Destailleur
af15e3ae9e Fix condition on table creation 2022-03-31 16:34:24 +02:00
atm-steve
4fa656be96 Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
Laurent Destailleur
b6b20ac818 Code comment 2022-03-29 14:23:47 +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
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
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