Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
81,180 Commits 36 Branches 189 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

5117 Commits

Author SHA1 Message Date
Laurent Destailleur
c6c498fd67 Merge pull request #11829 from atm-florian/dev_contactdefault 
NEW : Address/Contact by default on third parties
 2019-10-07 15:27:58 +02:00
Laurent Destailleur
e02794248e Merge branch 'develop' into patch-264 2019-10-07 13:25:16 +02:00
Frédéric FRANCE
f80fa08a2d Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-07 07:57:05 +02:00
Laurent Destailleur
d4bb6490e9 Fix migration 2019-10-06 16:25:22 +02:00
Frédéric FRANCE
6384e7eb67 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
florian HENRY
2d3dd9ed3c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-10-04 18:10:16 +02:00
Frédéric FRANCE
0383fdbeee Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 18:37:14 +02:00
Frédéric FRANCE
91761e8185 fix migration script for thirdparties 2019-10-02 21:16:33 +02:00
Frédéric FRANCE
fe4629cd87 new migration script for thirdparties 2019-10-02 21:11:21 +02:00
Frédéric FRANCE
634fc5727c new migration script for contacts 2019-10-02 21:08:41 +02:00
Frédéric FRANCE
b96911e9b7 new migration script for members 2019-10-02 21:05:19 +02:00
Frédéric FRANCE
cc03a0a63f new migration script for user 2019-10-02 20:53:47 +02:00
Frédéric FRANCE
edf559697a restore unfinished old commit 2019-10-01 23:47:45 +02:00
Frédéric FRANCE
aca9d92db8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
010b2723b6 work on migration script 2019-10-01 20:14:06 +02:00
Frédéric FRANCE
2ac908ffcf work on migration script 2019-10-01 19:59:49 +02:00
florian HENRY
d48f0fa791 resolve conflixt 2019-10-01 18:07:59 +02:00
Frédéric FRANCE
9755d15f52 work on migration script 2019-10-01 17:51:44 +02:00
Laurent Destailleur
b79831ec39 Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00
Laurent Destailleur
956b46d920 Fix warnings 2019-10-01 11:37:15 +02:00
Frédéric FRANCE
6a7170f725 Merge remote-tracking branch 'upstream/develop' into phpcalendar 2019-10-01 07:55:09 +02:00
Frédéric FRANCE
c57c8eee88 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 07:41:10 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
91b7e81085 Fix warnings 2019-09-30 21:51:42 +02:00
Frédéric FRANCE
31418c2e42 check php-calendar extension 2019-09-30 21:14:25 +02:00
Laurent Destailleur
3ca1a9ba28 Merge branch 'test_pgsql_installation' of https://github.com/atm-greg/dolibarr into atm-greg-test_pgsql_installation 2019-09-30 19:59:52 +02:00
Frédéric FRANCE
b87610adcc Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Laurent Destailleur
22f07fe54d Merge branch 'develop' into patch-234 2019-09-30 18:09:05 +02:00
Frédéric FRANCE
258424416e Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
ptibogxiv
f132f2f947 Update 10.0.0-11.0.0.sql 2019-09-29 15:40:26 +02:00
ptibogxiv
d0b06a1eab Update llx_facture.sql 2019-09-29 15:39:59 +02:00
Frédéric FRANCE
cea3669ffa Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00
Laurent Destailleur
d0d884742f FIX #11861 Not consistent code to manage measuring units 2019-09-27 19:45:33 +02:00
Laurent Destailleur
07b555b965 Merge branch 'develop' into patch-255 2019-09-27 15:23:15 +02:00
Laurent Destailleur
f5c839217a Merge pull request #11914 from fmarcet/develop 
Fix: Load invoices only if showed
 2019-09-27 14:34:16 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
a79c4608d6 Merge pull request #11934 from atm-quentin/NEW_stock_categories 
NEW Categories/Tags are also available on warehouses
 2019-09-27 12:41:28 +02:00
Frédéric FRANCE
03086026b8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Frédéric FRANCE
5eb0fb462b Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-27 07:59:02 +02:00
Laurent Destailleur
72f9073337 Clean vat code samples to have cleaner rules for rowid. 2019-09-26 12:44:44 +02:00
Frédéric FRANCE
41cb628d05 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +02:00
Laurent Destailleur
19c78d42e9 Fix az09 -> aZ09 2019-09-24 14:20:29 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Ferran Marcet
a8cc11d232 Merge branch 'developup' into develop 2019-09-24 13:38:11 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00