Commit Graph

74114 Commits

Author SHA1 Message Date
Laurent Destailleur
2c68c98884
Merge pull request #10762 from frederic34/patch-3
Update bom_card.php
2019-03-07 12:32:35 +01:00
Laurent Destailleur
d6cf493880
Merge pull request #10768 from altatof/export
FIX avoid timeout for big export
2019-03-07 12:31:51 +01:00
Laurent Destailleur
40afeebe2d
Merge pull request #10748 from frederic34/patch-2
Update mailinglist_mymodule_myobject.modules.php
2019-03-07 12:31:09 +01:00
Laurent Destailleur
a9952c5807
Merge pull request #10741 from frederic34/patch-5
Update main.inc.php
2019-03-07 12:30:03 +01:00
Laurent Destailleur
f54eb78260 NEW Show the latest date of subscription in member statistics reports 2019-03-07 12:22:24 +01:00
Christophe Battarel
a6bb1cf5f6 avoid timeout 2019-03-07 11:27:06 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
e67890bd22 NEW Can enter price with or without tax when entering expense repor line 2019-03-07 11:09:04 +01:00
Laurent Destailleur
96d4e28473 FIX Vat src code lost after editing expense report line 2019-03-07 11:08:01 +01:00
Laurent Destailleur
2cd09aaf09 Prepare version 9.0.2 2019-03-07 10:57:15 +01:00
Laurent Destailleur
c513116717 FIX missing vat_src_code when inserting an expense report line 2019-03-07 10:56:48 +01:00
Laurent Destailleur
b15e00cae7 FIX Autodetect buy price for invoices autogenerated with templates. 2019-03-06 21:39:09 +01:00
Laurent Destailleur
6206402be3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-06 20:51:44 +01:00
Laurent Destailleur
1b0aec0847 Complete fields for template invoices 2019-03-06 20:51:07 +01:00
Laurent Destailleur
31c296f44b Fix bad tooltip to rm file 2019-03-06 20:01:21 +01:00
Laurent Destailleur
ddc3478156 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-06 19:14:15 +01:00
Laurent Destailleur
e163849d05 Fix label 2019-03-06 19:13:59 +01:00
Frédéric FRANCE
7b09562976
Update bom_card.php 2019-03-06 19:05:13 +01:00
Frédéric FRANCE
edf9913c20
Update bom_list.php 2019-03-06 19:00:12 +01:00
Frédéric FRANCE
2185f129cd
syntax error 2019-03-06 18:44:03 +01:00
Frédéric FRANCE
e57a674939
Update setup.php 2019-03-06 18:36:48 +01:00
Frédéric FRANCE
02d4a234b7
Update bom.lib.php 2019-03-06 18:30:34 +01:00
Frédéric FRANCE
cf00b2a2df
Update bom_note.php 2019-03-06 18:26:23 +01:00
Frédéric FRANCE
e4de89e3eb
Update bom_list.php 2019-03-06 18:25:02 +01:00
Frédéric FRANCE
6067994119
Update bom_document.php 2019-03-06 18:23:25 +01:00
Frédéric FRANCE
8246c79b15
Update bom_card.php 2019-03-06 18:20:44 +01:00
Laurent Destailleur
60a02bc241
Merge pull request #10757 from frederic34/patch-3
phpcs fix
2019-03-06 18:11:07 +01:00
Laurent Destailleur
9ffac1ca4a
Merge pull request #10750 from altatof/themefix
FIX : allow eldy theme stylesheet to be included in custom themes
2019-03-06 18:10:41 +01:00
Laurent Destailleur
401ad65975 Fix API explorer was broken due to corrupted API 2019-03-06 18:04:36 +01:00
Frédéric FRANCE
c2070190f2
phpcs fix 2019-03-06 16:51:35 +01:00
Christophe Battarel
a6b759bd87 remove specific entry in gitignore 2019-03-06 16:50:28 +01:00
Christophe Battarel
cb39c6f3ce remove specific entry in gitignore 2019-03-06 16:48:48 +01:00
Laurent Destailleur
0c2a0c643b NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
Laurent Destailleur
d4409ffb08 Restore menu MRP on new eldy code 2019-03-06 14:18:58 +01:00
Laurent Destailleur
df180a7682
Merge pull request #10451 from wdammak/patch-25
Update eldy.lib.php
2019-03-06 13:59:16 +01:00
Laurent Destailleur
1ab3949e9c Optimize js code 2019-03-06 13:01:01 +01:00
Laurent Destailleur
5a07281bb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-06 11:49:52 +01:00
Laurent Destailleur
1ee52131b4 Fix badge for sf download 2019-03-06 11:49:41 +01:00
Christophe Battarel
6c6a1a02f0 allow this script to be included in custom themes 2019-03-06 11:06:35 +01:00
Christophe Battarel
cb131c56bf Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-06 11:01:51 +01:00
Frédéric FRANCE
b4851e3d40
Update mailinglist_mymodule_myobject.modules.php
Warning: Declaration of mailing_***********::add_to_target($mailing_id) should be compatible with MailingTargets::add_to_target($mailing_id, $cibles)
2019-03-05 21:54:51 +01:00
Laurent Destailleur
9ad1597fcc
Merge pull request #10747 from atm-gauthier/9.0_fix_extrafields_always_visible_in_view_mode
FIX : extrafields always visible on view mode
2019-03-05 18:54:51 +01:00
Laurent Destailleur
cfd39a1483
Merge pull request #10742 from OPEN-DSI/fix-pdf-beluga-orientation
Fix authorize long references in Beluga PDF model (uses Landscape mode)
2019-03-05 18:45:02 +01:00
Laurent Destailleur
39e5c6238d
Merge pull request #10739 from frederic34/patch-3
Update list.php
2019-03-05 18:43:36 +01:00
Laurent Destailleur
0d6a2f446c
Merge pull request #10740 from frederic34/patch-4
Update mymodulewidget1.php
2019-03-05 18:43:02 +01:00
Laurent Destailleur
ec15f9251d
Merge pull request #10738 from frederic34/patch-2
phpcs fix
2019-03-05 18:42:22 +01:00
Laurent Destailleur
db3f362d10
Merge pull request #10746 from ptibogxiv/patch-139
FIX: date in ticket.class.php
2019-03-05 18:41:32 +01:00
Laurent Destailleur
c06d2f6c3b Remove warning 2019-03-05 18:22:03 +01:00
Frédéric FRANCE
906e1b8425
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:21:46 +01:00
Laurent Destailleur
db5dd7f9aa Fix phpunit 2019-03-05 18:19:37 +01:00