lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

6912 Commits

Author SHA1 Message Date
Gauthier PC portable 024
60defe4108 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-09 13:29:46 +02:00
Gauthier PC portable 024
5daca35e79 FIX : new tables loading system 2022-05-09 12:33:39 +02:00
Laurent Destailleur
e9d7e216e2 Debug v16 2022-05-09 12:13:31 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
65eb11efdf Fix sql migration 2022-05-08 17:39:53 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Laurent Destailleur
6b9ed5aa32 Better message in installation process 2022-05-06 20:03:59 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2022-05-06 12:46:26 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
Laurent Destailleur
583343a171 Clean code 2022-05-06 05:08:54 +02:00
Laurent Destailleur
93cd0174cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-05 13:16:03 +02:00
Laurent Destailleur
6c624a9a45 Fix name of sql file 2022-05-05 12:26:15 +02:00
Laurent Destailleur
e3b777ad5b
Merge pull request #20649 from FHenry/15.0_fix_createtable_without_migration_script 
fix: CREATE TABLE llx_element_tag without migration script
 2022-05-04 17:15:53 +02:00
Laurent Destailleur
3574864062 Add email_company 2022-05-04 15:07:50 +02:00
Laurent Destailleur
82f7f30f0a Clean code 2022-05-04 14:58:50 +02:00
Laurent Destailleur
0236c31e21
Merge pull request #20730 from Hystepik/develop#5 
New : module webhook database structure
 2022-05-04 01:05:09 +02:00
Laurent Destailleur
09d02dfbfa
Update llx_webhook_target-webhook.sql 2022-05-04 01:04:39 +02:00
Laurent Destailleur
5bb2772968 NEW Add firstname and lastname for module "Event Organization" 2022-05-03 18:20:39 +02:00
Laurent Destailleur
16bb5eeb3f NEW Add firstname and lastname for module "Event Organization" 2022-05-03 18:18:11 +02:00
lmarcouiller
4ea45ac05a fix table fields 2022-05-02 15:13:42 +02:00
lmarcouiller
2899a6dca5 fix database files 2022-05-02 10:41:59 +02:00
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
lmarcouiller
701960bd70 try to fix build fail 2022-04-28 11:47:13 +02:00
lmarcouiller
be2502c29f New : module webhook database structure 2022-04-28 10:50:55 +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
aa86b2c71f Fix root passfield not editable on install 
Fix user photo when gravatar not reachable
 2022-04-19 22:26:27 +02:00
Laurent Destailleur
25fbd3b385 Fix missing field 2022-04-16 13:28:38 +02:00
HENRY Florian
9acb1b2f88
Update 14.0.0-15.0.0.sql 2022-04-16 11:14:04 +02:00
Florian HENRY
bed974ebae Merge branch '15.0' of github.com:Dolibarr/dolibarr into 15.0_fix_createtable_without_migration_script 2022-04-15 10:22:33 +02:00
Florian HENRY
24bb6c6f83 fix: clean mess up around element_tag table 2022-04-15 10:20:52 +02:00
Laurent Destailleur
f61ca0b516
Merge branch 'develop' into NEW_stockstransfers 2022-04-14 22:50:31 +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
Gauthier PC portable 024
6faefa7d86 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-04-12 09:08:57 +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
5b86476f0b Link of country not defined, jump on country setup line 2022-03-31 16:57:15 +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
Laurent Destailleur
3ba9916be2 Fix default value used on install after a first failed try 2022-03-31 16:23:36 +02:00
Laurent Destailleur
9b206f9224 Can retreive some param of install from url 2022-03-31 15:51:48 +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
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
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
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