2
0
forked from Wavyzz/dolibarr
Commit Graph

5477 Commits

Author SHA1 Message Date
Alexandre SPANGARO
db522fe685 Merge remote-tracking branch 'upstream/develop' into 16a12_assets_sql 2022-05-21 07:16:45 +02:00
Alexandre SPANGARO
ea8759e627 NEW Add trigger to record the event of sending an email from a project #20912 2022-05-21 07:02:15 +02:00
Laurent Destailleur
c02e3f959f Merge pull request #20899 from atm-gauthier/NEW/sortorder_on_holiday_type_dictionnary
New/sortorder on holiday type dictionnary
2022-05-21 00:43:52 +02:00
Florian HENRY
93831663d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_new_add_ref_clinet_intervention 2022-05-20 10:31:29 +02:00
Gauthier PC portable 024
1e0972f0a1 NEW : sortorder on holiday type dictionnary 2022-05-19 12:34:05 +02:00
Laurent Destailleur
d38697d74b Missing data in resource module 2022-05-19 08:46:50 +02:00
Florian HENRY
2f959306f7 fix travis 2022-05-17 22:50:42 +02:00
Florian HENRY
ada81750c1 NEW: Add Customer Ref on Intervention 2022-05-17 12:53:50 +02:00
Laurent Destailleur
61153f04c8 Merge branch 'develop' into dev_event_factrec 2022-05-16 15:34:39 +02:00
Laurent Destailleur
7c44436485 Fix phpunit 2022-05-16 15:04:57 +02:00
Laurent Destailleur
8410ba709a Fix field 2022-05-16 15:02:24 +02:00
Laurent Destailleur
b75c0d805b Add more field 2022-05-16 15:01:33 +02:00
Florian HENRY
8ebeb0bf8a add c_action_trigger for auto batch invoice création 2022-05-13 11:29:48 +02:00
Florian HENRY
0425becc03 add c_action_trigger and fix travis 2022-05-13 11:23:49 +02:00
Laurent Destailleur
c08595866f Merge branch 'develop' into burundi_support_for_dolibarr_13 2022-05-12 01:51:17 +02:00
Eric Seigne
b8e73b4b72 burundi companies type 2022-05-10 23:47:49 +02:00
Eric Seigne
7aad16bc80 burundi currencie 2022-05-10 23:47:36 +02:00
Eric Seigne
99225dab9f burundi departements (Communes) 2022-05-10 23:47:22 +02:00
Eric Seigne
4d759c23b3 burundi : regions (provinces) 2022-05-10 23:47:04 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
2022-05-09 16:53:53 +02:00
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
lvessiller
00f321475b NEW replace fk_categories_product with categories_product in inventory 2022-05-09 09:33:44 +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
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
lvessiller
ccc4d50a1c FIX resolve conflicts 2022-05-06 09:45:20 +02:00
Laurent Destailleur
f3a630fd30 Clean code 2022-05-06 05:21:26 +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
lvessiller
31d5fe5da3 FIX resolve conflicts 2022-05-04 11:20:24 +02:00
lvessiller
e01f912f41 Resolve conflicts 2022-05-04 11:11:05 +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
lvessiller
734cdffa59 FIX resolve conflicts 2022-05-02 10:03:23 +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