Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,033 Commits 36 Branches 189 Tags
0a7ce338f96d53319045c91eaaba3d062bbf08b3
Commit Graph

2970 Commits

Author SHA1 Message Date
Laurent Destailleur
0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-08-28 02:23:34 +02:00
Laurent Destailleur
ad0cc098ee Fix alter forgot 2018-08-28 01:37:25 +02:00
gauthier
79aa390fe8 FIX : table llx_chargessociales doesn't exists 2018-08-27 15:07:19 +02:00
Laurent Destailleur
2cbbb6e622 Prepare 8.0.0 release 2018-08-13 23:04:58 +02:00
Laurent Destailleur
f96dd391fa Fix error in foreign key pointing to old table 2018-08-13 16:11:23 +02:00
Laurent Destailleur
8ab03c469a Fix migration 2018-07-27 13:42:32 +02:00
Regis Houssin
25c93de801 FIX missing drop old postgresql unique key 2018-07-24 11:23:44 +02:00
Laurent Destailleur
cbc17d4658 Fix ecm when using multicompany 2018-07-10 12:03:51 +02:00
Laurent Destailleur
5883899bc7 Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-07-05 02:33:39 +02:00
Laurent Destailleur
64e778a78f Fix pgsql migration 2018-07-04 10:26:25 +02:00
Laurent Destailleur
c2499f298c Fix bad name of field 2018-07-02 18:08:55 +02:00
Laurent Destailleur
0f77e3c05c Fix bad name of field 2018-07-02 17:57:32 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
a30789e423 Fix table name 2018-06-27 00:34:45 +02:00
Laurent Destailleur
aa37786596 Fix migration errors reported by Softaculous 2018-06-26 11:51:49 +02:00
Laurent Destailleur
cbe682582e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-26 01:25:24 +02:00
Laurent Destailleur
5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/journals_list.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/other.lang
 2018-06-26 01:25:03 +02:00
Regis Houssin
a78ba20c9b Fix: update price format 2018-06-25 12:20:08 +02:00
Regis Houssin
3d9b191806 Fix: restore and update example data 2018-06-25 12:16:02 +02:00
Regis Houssin
a6729b0bd1 Fix: change field name and remove obsolete data 2018-06-25 09:10:24 +02:00
Laurent Destailleur
bc71685258 Fix migration error 2018-06-25 08:30:37 +02:00
Laurent Destailleur
c664d0c2fd Fix phpunit 2018-06-24 18:26:35 +02:00
Laurent Destailleur
a50b62d7e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-24 10:26:24 +02:00
Laurent Destailleur
4f533be01a For #9006 2018-06-24 10:26:08 +02:00
Laurent Destailleur
5829014218 Merge branch 'develop' into NEW_advance_targer_filter_everywhere 2018-06-24 10:24:26 +02:00
Laurent Destailleur
ac19a6e211 Merge pull request #8993 from hregis/develop_pgsql 
Fix: wrong field name, use "type" instead "llx_c_type_fees"
 2018-06-22 15:09:31 +02:00
atm-quentin
d53aa71673 NEW advance target filtering can be used everywhere with tpl and fk_element 2018-06-22 10:54:00 +02:00
Laurent Destailleur
cfcedc1170 Fix remove old unique key constraint 2018-06-21 00:11:37 +02:00
Regis Houssin
e1db5ab433 Fix: wrong field name, use "type" instead "llx_c_type_fees" 2018-06-19 19:56:39 +02:00
hythamsoliman81
f461ab5f96 SQL synatx error at llx_website_page.sql 2018-06-17 00:12:06 +02:00
Laurent Destailleur
4900f1f1f1 Fix sql coding style 2018-06-13 23:10:29 +02:00
Laurent Destailleur
094b31a563 Complete migration 2018-06-13 21:46:55 +02:00
Laurent Destailleur
ed41731a50 Merge pull request #8954 from mwelters/develop 
German Accounting Plan SKR03 and SKR04 (mysql/data)
 2018-06-13 21:45:02 +02:00
Laurent Destailleur
c09e69aeb6 Update llx_accounting_abc.sql 2018-06-13 21:44:43 +02:00
Laurent Destailleur
074ada10e6 Merge pull request #8940 from aspangaro/8.0-b33 
Fix : Migration for Romanian chart of accounts
 2018-06-13 21:37:50 +02:00
Laurent Destailleur
1e488a6f7f Merge pull request #8924 from dtix/patch-1 
Romania vat rate changed
 2018-06-13 20:01:48 +02:00
Markus Welters
885904132c Update llx_accounting_abc.sql 2018-06-13 09:37:12 +02:00
Laurent Destailleur
64537ba9bf Fix missing field in install 2018-06-11 09:20:26 +02:00
Alexandre SPANGARO
c7e6ee3a1b Fix : Migration for Romanian chart of accounts 2018-06-10 04:02:35 +02:00
markus
f3a7e2205b fix typo 2018-06-09 19:07:33 +02:00
markus
9ce10ccef7 Adding SKR03 and SKR04 2018-06-09 19:00:24 +02:00
dtix
e6da000ae8 Romania vat rate changed 2018-06-06 14:48:11 +03:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
4b58158588 Update 7.0.0-8.0.0.sql 2018-05-29 10:47:14 +02:00
Laurent Destailleur
18898558e4 Merge branch 'develop' into patch-13 2018-05-29 10:46:28 +02:00
Laurent Destailleur
01c8b33483 FIX 8870 2018-05-29 10:18:45 +02:00
Laurent Destailleur
0f50b0ffb1 Code comment 2018-05-29 10:00:08 +02:00
Laurent Destailleur
f3f252e88b Fix duplicate record before creating primary key 2018-05-27 19:31:03 +02:00
Frédéric FRANCE
d67bed57d9 Update 7.0.0-8.0.0.sql 2018-05-26 11:26:20 +02:00
Frédéric FRANCE
af73e6cd4d Update llx_paiementfourn.sql 2018-05-26 11:23:49 +02:00