Commit Graph

70610 Commits

Author SHA1 Message Date
Laurent Destailleur
bd994cbead Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-10-24 02:50:12 +02:00
Laurent Destailleur
a9736c1eef
Merge pull request #9828 from frederic34/patch-15
code comment
2018-10-24 02:44:46 +02:00
Laurent Destailleur
a3d6146bed Code comment 2018-10-24 02:32:01 +02:00
Laurent Destailleur
c266084db7
Merge pull request #9841 from laudeco/fix/9824_pdf_merge
FIX the pdf merge
2018-10-24 02:31:48 +02:00
Laurent Destailleur
5a7f2c7e33
Merge pull request #9832 from frederic34/patch-18
fix phpunit
2018-10-24 02:26:12 +02:00
Laurent Destailleur
92b5346a6c
Merge pull request #9840 from frederic34/patch-21
code comment categories class
2018-10-24 02:25:23 +02:00
Laurent Destailleur
4b4d422126
Merge pull request #9835 from frederic34/patch-20
Update ajaxdirtree.php
2018-10-24 02:21:19 +02:00
Laurent Destailleur
065d715d41 FIX #9837 - The fetchAllXXX was not managing correctly the limit 2018-10-24 02:20:07 +02:00
Laurent Destailleur
83dacf6290
Merge pull request #9845 from frederic34/patch-22
remove deprecated form_confirm
2018-10-24 02:06:54 +02:00
Laurent Destailleur
f10cb76597 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 02:00:56 +02:00
Laurent Destailleur
ae44c4c7f5 Disable duplicate feature with emailing module and field "unsubscribe
requested"
2018-10-24 02:00:43 +02:00
Laurent Destailleur
03b93781a0
Merge pull request #9848 from bafbes/abb80038
New : parameter for getnomurl in field specification
2018-10-24 01:53:19 +02:00
Laurent Destailleur
d5285ca359
Update commonobject.class.php 2018-10-24 01:53:07 +02:00
Laurent Destailleur
f8ea9e7099
Merge pull request #9857 from atm-john/add_combo_seach_by_fourn_ref
NEW hidden conf to search product by supplier ref
2018-10-24 01:48:17 +02:00
Laurent Destailleur
6161d8300c
Merge pull request #9850 from simnandez/develop
New: works with variants:
2018-10-24 01:47:39 +02:00
Laurent Destailleur
914e4f0501
Merge pull request #9855 from atm-john/Fix_printer
FIX/ADD missing print button for delivery form
2018-10-24 01:46:20 +02:00
Laurent Destailleur
c6cfb977bb
Merge pull request #9852 from atm-john/fix_develop_travis
Fix travis messages
2018-10-24 01:45:12 +02:00
Laurent Destailleur
54b0fa1057
Merge pull request #9846 from bafbes/abb80037
Fix:empty value instead of 0 for empty links
2018-10-24 01:43:37 +02:00
Laurent Destailleur
592bfafd51
Merge pull request #9829 from frederic34/patch-16
code comment
2018-10-24 01:42:41 +02:00
Laurent Destailleur
652bef3e61
Merge pull request #9830 from frederic34/patch-17
change class name from lettering to Lettering
2018-10-24 01:42:22 +02:00
Laurent Destailleur
fe665a060d
Merge branch 'develop' into patch-17 2018-10-24 01:42:02 +02:00
Laurent Destailleur
23a9416c19 Fix deprecated field 2018-10-23 23:51:27 +02:00
atm-john
82f40fb4b9 NEW hidden conf to search by supplier ref 2018-10-23 23:21:30 +02:00
atm-john
0fe2c63bc0 FIX missing print button for delivery form 2018-10-23 22:11:39 +02:00
Laurent Destailleur
0ad991766c Fix deletion of project when there is events 2018-10-23 17:53:01 +02:00
John BOTELLA
d9965d1986 Fix travis messages 2018-10-23 17:18:30 +02:00
Juanjo Menent
bdf94a4802 Merge remote-tracking branch 'upstream/develop' into develop 2018-10-23 13:08:18 +02:00
Juanjo Menent
e40ee879dc New: works with variants:
- If product is variant disable prices modify
- Add function isVariant for knowing if product is a Variant
2018-10-23 13:07:09 +02:00
Laurent Destailleur
e0b20c2632 Add holiday for India 2018-10-23 12:49:48 +02:00
Abbes Bahfir
7e7473e7df New : parameter for getnomurl in field dpecification 2018-10-23 01:25:38 +01:00
Abbes Bahfir
5bac6a92e6 Fix:empty value instead of 0 for empty links 2018-10-23 00:03:34 +01:00
Frédéric FRANCE
85a94ec577
Update view.php 2018-10-22 22:40:18 +02:00
Frédéric FRANCE
90b85c1106
Update html.form.class.php 2018-10-22 22:23:43 +02:00
Frédéric FRANCE
e49f2bc562
Update document_actions_post_headers.tpl.php 2018-10-22 22:20:26 +02:00
Frédéric FRANCE
4aec343b24
Update html.form.class.php 2018-10-22 22:13:54 +02:00
Frédéric FRANCE
38df6ac27b
remove deprecated form_confirm 2018-10-22 21:57:18 +02:00
Laurent Destailleur
f65df9e541 NEW Add option PDF_DISABLE_MYCOMPANY_LOGO to disable logo on PDF 2018-10-22 20:06:03 +02:00
De Coninck Laurent
59307165ce fix the pdf merge
fix the pdf merge.

[See: #9824]
2018-10-21 19:45:33 +02:00
Frédéric FRANCE
0171301543
code comment categories class 2018-10-21 19:19:35 +02:00
Laurent Destailleur
2816bdf747 FIX Date into filename of FEC file. 2018-10-21 16:22:56 +02:00
Laurent Destailleur
4e6b21881f Fix bug reported by scrutinizer 2018-10-21 12:14:20 +02:00
Laurent Destailleur
868caa4991 Missing ref_customer in popup 2018-10-21 12:05:31 +02:00
Laurent Destailleur
f6b3bc3bdb Fix thirdparty popup 2018-10-21 12:03:22 +02:00
Laurent Destailleur
fa99ea1f0f Fix thirdparty popup 2018-10-21 11:55:25 +02:00
Laurent Destailleur
cd9431809b Fix: do not loose country_code after update 2018-10-21 11:44:21 +02:00
Laurent Destailleur
d38c68e54f Remove unexpected char 2018-10-21 11:10:04 +02:00
Frédéric FRANCE
f169ec9259
Update ajaxdirtree.php 2018-10-21 10:37:49 +02:00
Frédéric FRANCE
f9a3dec26d
Update FactureTest.php 2018-10-20 23:07:08 +02:00
Frédéric FRANCE
80bd93d600
Update .travis.yml 2018-10-20 22:36:12 +02:00
Frédéric FRANCE
5f6cbda5a6
Update facture.class.php 2018-10-20 22:34:00 +02:00