Commit Graph

58358 Commits

Author SHA1 Message Date
hguibourgdev
e1f8cfd474 NEW : Add toolkit for StockLimit and DesiredStock 2017-07-24 20:59:46 +02:00
Laurent Destailleur
d5d95c31a6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-23 19:07:14 +02:00
Laurent Destailleur
585dde6cf5 Fix url 2017-07-23 19:06:47 +02:00
Laurent Destailleur
44023606c6 Fix pb in dolGetFirstLineOfText. Add PHPunit 2017-07-22 12:47:35 +02:00
Laurent Destailleur
6e77dab832 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-18 15:13:15 +02:00
Laurent Destailleur
7e1d282b1b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-07-18 15:12:28 +02:00
Laurent Destailleur
e41b98b5d4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-07-18 15:12:03 +02:00
Laurent Destailleur
b215940277 Merge pull request #7174 from atm-maxime/fix_user_from_member
Fix : creating user from member was failing due to column size difference
2017-07-18 14:49:33 +02:00
Laurent Destailleur
98cb1b7af1 Merge pull request #7171 from atm-ph/fix_5.0_search_lost
Fix lost search value in list if come from thirdparty card
2017-07-18 14:48:38 +02:00
Laurent Destailleur
f6060b976d Update list.php 2017-07-18 14:48:18 +02:00
Laurent Destailleur
7ac5054df8 Update list.php 2017-07-18 14:47:44 +02:00
Laurent Destailleur
ba2dcb9221 Merge pull request #7166 from hregis/5.0_bug
Fix: Trusty become default linux the July 18th 2017
2017-07-18 14:45:55 +02:00
Laurent Destailleur
9ea30c427e Merge pull request #7160 from hguibourgdev/patch-4
Update card.php
2017-07-18 14:36:12 +02:00
Laurent Destailleur
e19167dffa Merge pull request #7154 from atm-ph/fix_3.9_contrat_updateline_extra
Fix updateline extrafields contrat fail
2017-07-18 14:30:55 +02:00
Laurent Destailleur
97fe41d603 A info int smtp header 2017-07-18 12:49:19 +02:00
Maxime Kohlhaas
d35dbdea92 Change column size in sql table creation also 2017-07-18 10:16:59 +02:00
Laurent Destailleur
2a50a78497 Fix hack to solve link to restrictions 2017-07-18 10:15:48 +02:00
Maxime Kohlhaas
76eac7ce6a Fix : creating user from member was failing due to column size difference 2017-07-18 10:13:10 +02:00
phf
885fc3c5b7 Fix lost search value in list if come from thirdparty card 2017-07-17 11:04:48 +02:00
Regis Houssin
2c5bdaf4ad Fix: Trusty become default linux the July 18th 2017 2017-07-16 08:23:27 +02:00
Laurent Destailleur
4e45c7fdba Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-15 21:21:40 +02:00
Laurent Destailleur
f9b9a9972e Fix value not defined 2017-07-15 17:22:57 +02:00
hguibourgdev
2166b3d467 Update card.php
FIX "!" is missing on test : empty($object->date_livraison)
2017-07-15 12:04:59 +02:00
Laurent Destailleur
4055ac82ab Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-15 03:47:54 +02:00
Laurent Destailleur
24ecd48b22 Minor fix 2017-07-15 03:40:37 +02:00
phf
f1c23f25f0 Fix updateline extrafields contrat fail 2017-07-13 16:49:58 +02:00
Laurent Destailleur
6023e686a4 Merge pull request #7139 from atm-florian/5.0_fixmigMG
FIX PgSQL
2017-07-13 14:27:18 +02:00
Laurent Destailleur
cbef85ddef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-13 14:17:08 +02:00
Laurent Destailleur
cd3d18cb4d Fix detection of payment for credit note 2017-07-13 14:16:51 +02:00
florian HENRY
017b654acd FIX PgSQL 2017-07-11 17:45:16 +02:00
Laurent Destailleur
1617deeb81 Merge pull request #7132 from Gecka-Apps/5.0-fix1
Fixes local taxes repports by rate
2017-07-10 21:30:39 +02:00
Laurent Destailleur
715280b03a Merge pull request #7131 from atm-maxime/4.0
Fix : script to migrate photo path
2017-07-10 21:27:56 +02:00
Laurent Dinclaux
64a5be3e00 Fixes travis error: Arguments with default values must be at the end of the argument list 2017-07-10 14:14:21 +11:00
Laurent Dinclaux
244574f8e6 Fixes functions comments 2017-07-10 13:19:59 +11:00
Laurent Dinclaux
253f7e252d Fixes local taxes repports by rate 2017-07-10 13:15:14 +11:00
Maxime Kohlhaas
f166c96ed5 Fix : script to migrate photo path 2017-07-09 13:09:17 +02:00
Laurent Destailleur
65ea0fc2b4 FIX value of user id filled to 0 in llx_bank_url when recording an
expense report.
2017-07-08 22:16:35 +02:00
Laurent Destailleur
7b6e60077a FIX id of user not saved when making a payment of expense report 2017-07-08 21:53:28 +02:00
Laurent Destailleur
4290be7ee6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-08 18:10:02 +02:00
Laurent Destailleur
ba3b6b6aa5 Better support of vat with code in expense report 2017-07-08 18:09:45 +02:00
Laurent Destailleur
efd292e8f5 Merge pull request #7126 from atm-gauthier/FIX_add_contact
FIX : we have to check if contact doesn't already exist on add_contact
2017-07-07 20:33:24 +02:00
Laurent Destailleur
5046852caa Merge pull request #7121 from jfefe/patch-14
Bad path for document file
2017-07-07 20:15:18 +02:00
Laurent Destailleur
bd0dba6439 Update card.php
Better fix for future
2017-07-07 20:14:47 +02:00
Laurent Destailleur
b461d24f52 Merge pull request #7119 from atm-alexis/FIX_situ_pdf_total_VAT
FIX invoice situation VAT total rounding into PDF crabe
2017-07-07 20:11:55 +02:00
Laurent Destailleur
249bfa3412 Merge pull request #7117 from atm-arnaud/FIX_insert_supplierpropale_det
Fix add supplierproposaldet without price (new product)
2017-07-07 20:09:52 +02:00
Laurent Destailleur
0d575b4cdf Merge pull request #7107 from atm-john/fix_contract_card
Fix return method
2017-07-07 19:58:27 +02:00
Laurent Destailleur
b7af0cca63 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/holiday/card.php
2017-07-07 19:39:57 +02:00
Laurent Destailleur
fd5f992be4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-07-07 19:15:18 +02:00
Laurent Destailleur
4c1b485d47 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/compta/facture/list.php
2017-07-07 19:06:25 +02:00
Laurent Destailleur
12a41d7dd2 Merge pull request #7091 from atm-arnaud/FIX_referent_invoice_list_in_product_card
FIX status were wrong on product for invoice referent list
2017-07-07 19:03:19 +02:00