Commit Graph

75619 Commits

Author SHA1 Message Date
Laurent Destailleur
2839eedbbf Fix error on emailcollector for tickets 2019-05-02 16:06:14 +02:00
Laurent Destailleur
4f9ea912ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/website.inc.php
2019-05-02 14:41:56 +02:00
Laurent Destailleur
79754eb326 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/comm/remx.php
2019-05-02 14:39:30 +02:00
Laurent Destailleur
45d618cd7a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-02 14:37:54 +02:00
Laurent Destailleur
ae7ba162f2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-02 14:37:46 +02:00
Laurent Destailleur
c222cbfef1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 14:37:23 +02:00
Laurent Destailleur
66b7a446a7
Merge pull request #11102 from grandoc/develop
FIX : typo error
2019-05-02 14:24:07 +02:00
Philippe GRAND
8e936fda4f FIX : typo error 2019-05-02 14:19:50 +02:00
Laurent Destailleur
220a81dfc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 14:19:47 +02:00
Laurent Destailleur
1a16dc1166
Merge pull request #11089 from frederic34/patch-5
Fix do not delete all discount when splitting (supplier)
2019-05-02 14:05:49 +02:00
Laurent Destailleur
e2c7c0574e
Merge pull request #11086 from andreubisquerra/master
NEW Add history to view and print previous sales on TakePos.
2019-05-02 14:04:57 +02:00
Laurent Destailleur
1378d5e89b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 14:03:47 +02:00
Laurent Destailleur
263b6cafbc Fix var 2019-05-02 14:03:35 +02:00
Laurent Destailleur
8c76c404bd
Merge pull request #11088 from defrance/patch-141
planned_timespent not present on task
2019-05-02 14:01:19 +02:00
Laurent Destailleur
a75223c850 Debug ticket module 2019-05-02 13:53:13 +02:00
Laurent Destailleur
1ac2c5f6f3
Merge pull request #11083 from madx666/fix-ticket
Fix ticket search and display
2019-05-02 13:47:19 +02:00
Laurent Destailleur
e81f10c790 Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION 2019-05-02 13:45:49 +02:00
Laurent Destailleur
5145680279 Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION 2019-05-02 13:31:47 +02:00
Laurent Destailleur
e5777f64f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 13:24:47 +02:00
Laurent Destailleur
4a81e8fd62 Debug call to apilayer 2019-05-02 13:24:28 +02:00
Laurent Destailleur
e80843b9bf
Merge pull request #11075 from Mavyre/patch-3
Corrected syncRates parameter
2019-05-02 12:43:13 +02:00
Laurent Destailleur
cf7b27786c
Update multicurrency.class.php 2019-05-02 12:43:01 +02:00
Laurent Destailleur
553d97d290
Merge pull request #11077 from ptibogxiv/patch-159
FIX: dolibarrize civility for fetch member
2019-05-02 12:40:51 +02:00
Laurent Destailleur
590c6fb91f
Update adherent.class.php 2019-05-02 12:40:34 +02:00
Laurent Destailleur
8c625dbcec
Merge pull request #11080 from mrsof/patch-1
FIX : Typo
2019-05-02 12:39:09 +02:00
Laurent Destailleur
c049ba7900
Merge pull request #11076 from frederic34/patch-2
phpcs fix
2019-05-02 12:38:45 +02:00
Laurent Destailleur
425dd6faf7
Merge branch 'develop' into patch-2 2019-05-02 12:38:38 +02:00
Laurent Destailleur
86f5889a72
Merge pull request #11078 from Supermanu/help_extrafields
Show help text for extrafields in forms
2019-05-02 12:36:15 +02:00
Laurent Destailleur
dcd93db7f5
Merge pull request #11073 from ptibogxiv/patch-158
FIX : dolibarrize fk_soc ->socid for member
2019-05-02 12:34:23 +02:00
Laurent Destailleur
626ab59144
Merge pull request #11079 from ptibogxiv/patch-160
FIX : error with call IsInEEC
2019-05-02 12:32:48 +02:00
Laurent Destailleur
ceeb9752ce Fix PHPCS 2019-05-02 12:28:40 +02:00
Laurent Destailleur
0f8c7df6fe Debug api of module BOM 2019-05-02 12:19:43 +02:00
Laurent Destailleur
4756499a81 Debug module builder for generation of APIs 2019-05-02 12:03:14 +02:00
Laurent Destailleur
3a8d645fb9 Debug module ticket 2019-05-01 20:55:46 +02:00
Laurent Destailleur
90a1181dc5 Debug module Ticket 2019-05-01 20:41:03 +02:00
Laurent Destailleur
9955af5194 Debug ticket module 2019-05-01 17:53:41 +02:00
Laurent Destailleur
a75c6a81d1 FIX Follow rule to create a new page 2019-05-01 17:15:42 +02:00
Laurent Destailleur
50b1a54dca FIX Update/delete currency on same languages 2019-05-01 14:06:30 +02:00
Laurent Destailleur
3bda9be775 Fix error 500 2019-05-01 13:46:45 +02:00
Frédéric FRANCE
ac304f58b0
clean new commits 2019-04-30 20:37:59 +02:00
Frédéric FRANCE
5766bb0b8a
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-04-30 20:16:43 +02:00
Laurent Destailleur
61bf731d17 FIX Balance of td 2019-04-30 18:11:35 +02:00
Laurent Destailleur
9c45b781af Fix balance of colspan 2019-04-30 16:44:11 +02:00
Laurent Destailleur
2136bce4b0 FIX missing situation invoice in list 2019-04-30 15:10:38 +02:00
Frédéric FRANCE
d9a1c2b235
Fix do not delete all discount when splitting 2019-04-30 13:54:50 +02:00
Laurent Destailleur
b13bc0e698 Fix loading of website page object not done for home page 2019-04-30 13:51:31 +02:00
Laurent Destailleur
203998a2c7 Fix loading of website page object not done for home page 2019-04-30 13:51:04 +02:00
Laurent Destailleur
feb0800208 Fix loading of website page object not done for home page 2019-04-30 13:50:31 +02:00
Laurent Destailleur
0cd1fc79f2 NEW Add a security permission to edit php dynamic content on website. 2019-04-30 13:05:13 +02:00
BENKE Charlene
f8f40a9239
planned_timespent not present on task
duration is the good one
2019-04-30 11:27:33 +02:00