Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
108,455 Commits 36 Branches 189 Tags
f4f8b67d10a486bb00b7693c99754403bea4920c
Commit Graph

4985 Commits

Author SHA1 Message Date
UT from dolibit
65b26e4ffc Update llx_c_availability.sql 2022-04-29 20:08:27 +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
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
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
Laurent Destailleur
06f8af71ef Code comment 2022-04-07 11:24:39 +02:00
Laurent Destailleur
5e8f632a9b Close #20571 2022-04-07 11:22:28 +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
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
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
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
UT from dolibit
b6ab3275c3 Update llx_20_c_departements.sql 
San Salvador / El Salvador Departmentos
 2022-03-29 21:00:34 +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
Laurent Destailleur
55e414ca30 Fix sql 2022-03-26 16:02: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
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
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