Frédéric FRANCE
|
210fb2eac1
|
Update mod_facture_mercure.php
|
2019-02-13 23:41:47 +01:00 |
|
Laurent Destailleur
|
749c7d9b0d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-13 22:48:25 +01:00 |
|
Laurent Destailleur
|
23a52b54e7
|
Fix php 7.3
|
2019-02-13 22:46:24 +01:00 |
|
Laurent Destailleur
|
2d5d2ccdc6
|
Merge pull request #10497 from wdammak/patch-26
NEW: Add the current modulepart to the Conf class
|
2019-02-13 16:43:46 +01:00 |
|
Laurent Destailleur
|
b9467c10bf
|
Merge pull request #10561 from eoxia-jimmy/develop
NEW: API Proposal, Orders, Invoices: Add contact details
|
2019-02-13 16:39:57 +01:00 |
|
Laurent Destailleur
|
a39b4bcb7d
|
Update api_orders.class.php
|
2019-02-13 16:39:45 +01:00 |
|
Laurent Destailleur
|
c2ab85aaf8
|
Update api_proposals.class.php
|
2019-02-13 16:39:17 +01:00 |
|
Laurent Destailleur
|
2d55c13e72
|
Merge pull request #10569 from frederic34/patch-21
Update supplier_proposal.class.php
|
2019-02-13 16:37:04 +01:00 |
|
Laurent Destailleur
|
e18ff7d087
|
Merge pull request #10568 from frederic34/patch-20
Update facture-rec.class.php
|
2019-02-13 16:36:54 +01:00 |
|
Laurent Destailleur
|
9f0ea65db5
|
Merge pull request #10559 from atm-florian/dev_importproduct_measuringunit
NEW : measuring unit dictionary and product size/unit import
|
2019-02-13 16:36:34 +01:00 |
|
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
|
26a77b0cbc
|
Update supplier_proposal.class.php
|
2019-02-13 00:06:51 +01:00 |
|
Frédéric FRANCE
|
56bbe41917
|
Update facture-rec.class.php
|
2019-02-12 23:54:38 +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 |
|
wdammak
|
32c48f0fa2
|
Update main.inc.php
break ;)
|
2019-02-12 19:56: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 |
|