lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73,389 Commits 43 Branches 150 Tags 886 MiB
2311912d8a
Commit Graph

73389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2311912d8a
Merge branch 'develop' into dev_importproduct_measuringunit 2019-02-13 16:35:46 +01:00
Laurent Destailleur
69313cbf0d
Merge pull request #10567 from frederic34/patch-18 
Update images.lib.php
 2019-02-13 16:25:32 +01:00
Laurent Destailleur
903ba57e09
Merge pull request #10565 from frederic34/patch-2 
fix doc in tax.lib.php
 2019-02-13 16:25:12 +01:00
Laurent Destailleur
534eac1a54
Merge pull request #10566 from frederic34/patch-17 
Update rssparser.class.php
 2019-02-13 16:24:45 +01:00
Laurent Destailleur
d79f5513e2
Merge pull request #10570 from frederic34/patch-22 
Update ical.class.php
 2019-02-13 16:24:19 +01:00
Laurent Destailleur
8e3b7cea28
Merge pull request #10564 from frederic34/fixphpcs 
fix phpcs
 2019-02-13 16:24:03 +01:00
florian HENRY
020fa52507 travis 2019-02-13 15:30:20 +01:00
Frédéric FRANCE
fa6bc309d6
Merge branch 'develop' into fixphpcs 2019-02-13 15:24:37 +01:00
florian HENRY
5bb260d3d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/product/stock/movement_card.php
 2019-02-13 13:52:35 +01:00
florian HENRY
9caefc9483 fix travis 2019-02-13 13:50:57 +01:00
florian HENRY
dd9896516b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/margin/agentMargins.php
	htdocs/product/stock/movement_card.php
	htdocs/projet/tasks/time.php
	htdocs/resource/class/html.formresource.class.php
 2019-02-13 12:52:07 +01:00
Laurent Destailleur
44fd36b15c Fix phpcs 2019-02-13 12:39:26 +01:00
florian HENRY
37c66c2ece travis 2019-02-13 12:32:06 +01:00
Laurent Destailleur
04e3f23476 Fix phpcs 2019-02-13 11:52:45 +01:00
Laurent Destailleur
ced386fdca Fix phpcs 2019-02-13 11:32:00 +01:00
Laurent Destailleur
5c27ec5d25 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/compta/compta-files.php
 2019-02-13 11:21:20 +01:00
florian HENRY
de87321c15 fix travcis 2019-02-13 10:28:08 +01:00
florian HENRY
e2d13c0e1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/contact/consumption.php
	htdocs/webservices/server_productorservice.php
 2019-02-13 09:23:52 +01:00
florian HENRY
5c059c897d fix travis (mosty for dev no conerne by my changes) 2019-02-13 09:21:14 +01:00
florian HENRY
d88475c61a Merge branch 'develop' of local repository into dev_importproduct_measuringunit 2019-02-13 08:59:18 +01:00
Frédéric FRANCE
95212e9cc1
Update ical.class.php 2019-02-13 00:44:34 +01:00
Frédéric FRANCE
3de192364b
Update ical.class.php 2019-02-13 00:12:20 +01:00
Frédéric FRANCE
e4b73e8273
Update images.lib.php 2019-02-12 23:39:59 +01:00
Frédéric FRANCE
fa31f95356
Update rssparser.class.php 2019-02-12 23:31:21 +01:00
Laurent Destailleur
11f48460b2 Fix 2019-02-12 23:26:25 +01:00
Frédéric FRANCE
2aae952760
fix doc in tax.lib.php 2019-02-12 23:25:26 +01:00
Laurent Destailleur
d86017b8ff Fix create left menu entry 2019-02-12 23:21:53 +01:00
Laurent Destailleur
639dfa09aa Fix creation of left menu 2019-02-12 23:17:40 +01:00
Laurent Destailleur
d42bf54436 Fix export zip 2019-02-12 23:12:33 +01:00
Frédéric FRANCE
484acc2e00
fix phpcs 2019-02-12 20:55:55 +01:00
Laurent Destailleur
036dc52170 Fix test 2019-02-12 19:55:54 +01:00
Laurent Destailleur
5a2161ad09 Debug export of zip 2019-02-12 19:47:46 +01:00
Laurent Destailleur
42bb96dc27 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-12 19:44:30 +01:00
Laurent Destailleur
6a8504e1f8 Fix missing constant 2019-02-12 19:44:12 +01:00
Laurent Destailleur
1f9f335e44 FIX creation of menu entry with parent id not int 
Conflicts:
	htdocs/admin/menus/edit.php
 2019-02-12 19:11:05 +01:00
Laurent Destailleur
986fb2ae38 FIX creation of menu entry with parent id not int 2019-02-12 19:09:27 +01:00
Laurent Destailleur
5fceee3048 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
 2019-02-12 19:02:19 +01:00
Laurent Destailleur
f1500281ef Fix phpcs 2019-02-12 19:00:50 +01:00
Laurent Destailleur
affbd20cdb FIX Bad link in menu manager 2019-02-12 18:56:32 +01:00
Laurent Destailleur
666d03f596 Fix multicompany for page to export zip of invoices 2019-02-12 18:15:30 +01:00
florian HENRY
914de5e089 fix mùigration script 2019-02-12 18:08:21 +01:00
Laurent Destailleur
68e6f32320 css 2019-02-12 17:56:03 +01:00
Laurent Destailleur
f7d183f3ef Add Kosovo country 2019-02-12 17:43:38 +01:00
Laurent Destailleur
25550959e3 Fix phpcs 2019-02-12 17:05:45 +01:00
florian HENRY
eba4be2335 ad missing files 2019-02-12 17:03:47 +01:00
Laurent Destailleur
0bb59bf6cc Fix phpcs 2019-02-12 17:03:09 +01:00
Laurent Destailleur
d134e18db6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-12 17:02:37 +01:00
Laurent Destailleur
fb5466fca0 Fix remove bad rule 2019-02-12 17:02:27 +01:00
Laurent Destailleur
0d8447ad39 Merge branch 'develop' of https://github.com/wdammak/dolibarr into 
wdammak-develop

# Conflicts:
#	htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
 2019-02-12 16:58:55 +01:00
florian HENRY
5b5f96bafb NEW : measuring unit dictionnary and product size/unit import 2019-02-12 16:58:11 +01:00