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

3014 Commits

Author SHA1 Message Date
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Laurent Destailleur
bb2f5ad588 Fix missing migration 2018-09-01 11:30:14 +02:00
Laurent Destailleur
ca2e9f20f6 Fix missing extrafield table 2018-08-31 18:39:13 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
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
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +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
d09850522b Fix migration 2018-08-12 22:27:54 +02:00
Laurent Destailleur
1b20d6feab Merge pull request #9214 from atm-greg/Add_supplier_product_description 
NEW Can record the supplier product description
 2018-08-12 18:56:27 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
atm-greg
be63f0dc89 add migration for desc_fourn 2018-08-07 09:49:57 +02:00
atm-greg
ad5f59822e Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510 Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:31:41 +02:00
atm-greg
7063850034 add sql field 2018-08-06 16:32:25 +02:00
Regis Houssin
b1a340b193 FIX "account_parent" is linked with "account_number" instead rowid 2018-08-03 14:01:00 +02:00
Regis Houssin
fa32e48b8a FIX change column "account_parent" and missing modify column 2018-08-03 13:53:12 +02:00
Juanjo Menent
788060aa28 Merge pull request #9178 from aspangaro/9.0_a3 
NEW : Add project on salaries
 2018-08-02 11:19:34 +02:00
Juanjo Menent
99f29a9764 Revert "FIX multicompany compatibility !" 2018-08-02 10:45:15 +02:00
Alexandre SPANGARO
0509a176ca Merge branch 'develop' into 9.0_a3 2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
Laurent Destailleur
8ab03c469a Fix migration 2018-07-27 13:42:32 +02:00
Frédéric FRANCE
2dd907a8e1 extrafield totalizable 2018-07-26 09:41:44 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Regis Houssin
835cb04631 FIX remove rowid for multicompany compatibility 2018-07-24 17:07:08 +02:00
Regis Houssin
d4920521b5 FIX multicompany compatibility ! 2018-07-24 15:44:21 +02:00
Regis Houssin
25c93de801 FIX missing drop old postgresql unique key 2018-07-24 11:23:44 +02:00
florian HENRY
2f2ca16e2b Add DELETE Trigger action into admin event agenda log 2018-07-10 16:44:14 +02:00
Laurent Destailleur
5f52dfa873 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-10 14:02:40 +02:00
Laurent Destailleur
cbc17d4658 Fix ecm when using multicompany 2018-07-10 12:03:51 +02:00
Laurent Destailleur
3a593f88f1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-05 10:28:24 +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
a2f517685e Fix pgsql migration 2018-07-04 10:21:42 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +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
63f3143718 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-02 12:18:34 +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
d8c7c61951 Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into 
hregis-8.0_canvas

# Conflicts:
#	htdocs/product/canvas/product/tpl/list.tpl.php
 2018-06-30 18:29:08 +02:00
Regis Houssin
718cbce8eb Fix: use "visible" field name instead "checked" 2018-06-30 10:58:08 +02:00
Regis Houssin
4c90ff9917 NEW add "checked" field for new list engine compatibility 2018-06-30 10:54:22 +02:00
Laurent Destailleur
31396739f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-30 01:26:59 +02:00
Laurent Destailleur
7fab2ca1f8 Add new field 2018-06-30 01:26:33 +02:00
Laurent Destailleur
a9e78f27d9 Merge branch 'develop' into patch-115 2018-06-30 01:21:58 +02:00
Laurent Destailleur
202ab93c5f Update 7.0.0-8.0.0.sql 2018-06-30 01:20:57 +02:00
Laurent Destailleur
7984316142 Update 7.0.0-8.0.0.sql 2018-06-30 01:20:44 +02:00
Laurent Destailleur
3112244529 Merge pull request #8884 from defrance/patch-117 
New : fichinter models (like factureRec)
 2018-06-30 01:19:03 +02:00