Laurent Destailleur
84ee18a11b
Fix bad management of second level approvement
2015-12-14 10:33:18 +01:00
Laurent Destailleur
c5054c41cf
Merge pull request #4211 from aspangaro/3.8-3879
...
Fix #3879 Wrong translation in the new expense report module
2015-12-13 19:56:55 +01:00
Laurent Destailleur
e37fc87cd5
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 17:34:06 +01:00
Laurent Destailleur
1978eebb69
Fix bad merge
2015-12-13 17:33:20 +01:00
Laurent Destailleur
a462cd232d
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
aspangaro
c3acee56e2
Fix #3879 Wrong translation in the new expense report module
2015-12-12 10:06:11 +01:00
Florian HENRY
8edf3c65c6
work on accounting
2015-12-11 11:46:22 +01:00
Raphaël Doursenaud
c0862762a5
Fix #3930 Removed executable bit
...
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
Raphaël Doursenaud
3f9efc537b
FIX #3953 Don't round supplier price
...
The price is already rounded when inserted on the product page.
It's also rounded at display.
There's no need to round it here.
Rounding it leads to serious calculation errors.
2015-12-07 14:35:04 +01:00
Laurent Destailleur
a209d18649
FIX Can use formated float number on old expense report module.
2015-12-06 19:51:28 +01:00
Florian HENRY
955fad910d
FIX : Bug: $this is not accessible in static context in
...
Mailing::libStatutDest #4050
2015-12-04 17:32:17 +01:00
Laurent Destailleur
7d7a978ba0
Merge pull request #4145 from FHenry/3.8
...
FIX : Contract date inconsistency between /comm/card.php and #4089
2015-12-04 10:25:50 +01:00
fmarcet
eb98bd1e78
FIX: Not delete a product when have customer price
2015-12-03 14:02:26 +01:00
Laurent Destailleur
12702ee128
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/report.lib.php
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
Florian HENRY
3dec67ffdf
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-12-03 12:58:39 +01:00
Laurent Destailleur
7105fabb79
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:51:49 +01:00
Laurent Destailleur
64e35255ae
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-12-03 12:47:32 +01:00
Laurent Destailleur
a7d03af4af
Fix sending emails from mergepedtool was just doing wrong things.
2015-12-03 12:47:21 +01:00
Laurent Destailleur
1694481df8
Merge pull request #4134 from FHenry/3.7
...
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-03 11:58:23 +01:00
Laurent Destailleur
c86d4b51b1
Merge pull request #4133 from ricardomm85/3.8
...
minor fix accessing $db
2015-12-03 11:57:25 +01:00
Florian HENRY
10a925f7b4
FIX: WHERE 1=1
2015-12-03 11:52:41 +01:00
Laurent Destailleur
7bad058f47
Merge pull request #4114 from fappels/3.8_fix_round_buyprice
...
FIX #3953 rounding of buying price
2015-12-03 11:48:09 +01:00
Florian HENRY
ee08c4afc4
Display the ref_supplier inside the contract list of /comm/card.php
...
#4090
2015-12-03 11:03:40 +01:00
Florian HENRY
b4160c7f81
Cannot change the date of a contract #4088
2015-12-03 10:58:06 +01:00
Florian HENRY
281eaf2987
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-03 10:27:23 +01:00
Florian HENRY
bd632cf2b0
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-02 12:12:26 +01:00
ricardomm
eb504ffacc
minor fix accessing $db
2015-12-02 11:53:23 +01:00
aspangaro
b1122b55d4
Fix : accountancy code on finance journal is not a constant
2015-11-30 21:07:27 +01:00
fappels
4a0ea97772
FIX #3953 rounding of buying price
...
fix javascript for rounding of buying price
2015-11-29 15:34:43 +01:00
Laurent Destailleur
e6806611a6
Merge pull request #4105 from atm-ph/fix_38_select_projects_list
...
FIX jquery select of project generate js error on change event
2015-11-28 16:30:21 +01:00
Laurent Destailleur
e72f4cb063
Merge pull request #4102 from fmarcet/3.6
...
Fix: Bug when idprof is mandatory on thrid creation and we use multicompany
2015-11-28 16:27:16 +01:00
Laurent Destailleur
2ce00b2956
Merge pull request #4099 from GPCsolutions/3.6-4097
...
FIX #4097 Public holiday calculation
2015-11-28 16:11:28 +01:00
phf
cbcb79b1eb
FIX jquery select of project generate js error on change event
2015-11-27 16:58:28 +01:00
Frédéric FRANCE
e6033369a8
Update resource.class.php
2015-11-26 20:33:07 +01:00
Frédéric FRANCE
1b9039af36
Update list.php
2015-11-26 20:30:11 +01:00
fmarcet
208bf2545f
Fix: Bug when idprof is mandatory on thrid creation and we use
...
multicompany
2015-11-26 17:14:03 +01:00
aspangaro
37da315af6
Remove old code
2015-11-26 06:30:09 +01:00
aspangaro
9a2259c681
Correct button 'Export' and 'Write bookkeeping' on finance journal
2015-11-26 06:19:24 +01:00
Laurent Destailleur
a6d8f943df
Fix several bugs into leave requets module
2015-11-26 02:12:37 +01:00
Laurent Destailleur
1608fec937
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-26 00:47:29 +01:00
Laurent Destailleur
f353464bce
Prepare code to fix #4095
2015-11-26 00:47:17 +01:00
Laurent Destailleur
a1a5eba2de
Merge pull request #4096 from braito4/patch-1
...
Part solution bug #4095
2015-11-26 00:34:04 +01:00
Laurent Destailleur
bc6d04e495
Typo
2015-11-26 00:08:34 +01:00
Laurent Destailleur
ddd0f8224f
Picto was not visible onto login page, we keep this behaviour.
2015-11-26 00:08:24 +01:00
Laurent Destailleur
ad087a75e6
Fix missing php
2015-11-25 23:32:00 +01:00
Laurent Destailleur
1caf148dc6
Merge pull request #4053 from marcosgdf/bug-3987
...
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
2015-11-25 22:24:56 +01:00
Laurent Destailleur
c8da4ee9f3
Merge pull request #4058 from marcosgdf/bug-3293
...
FIX #3293 Login page form icons not shown
2015-11-25 22:18:00 +01:00
aspangaro
8c0dffd24e
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
2015-11-25 20:23:41 +01:00
Raphaël Doursenaud
973e42d10f
FIX #4097 Public holiday calculation
...
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
2015-11-25 19:34:11 +01:00
braito4
677cba01ce
Part solution bug #4095
...
It allow us to deactivate the link to a project queries to lower the page workload.
2015-11-25 18:58:47 +01:00
Marcos García
a30f7d543a
Corrected fix
2015-11-25 10:19:11 +01:00
Raphaël Doursenaud
91ce70a6e9
FIX #4081 Added missing translation
2015-11-23 17:25:10 +01:00
Maxime Kohlhaas
da51a28766
Fix : situation percent should be 100 by default
2015-11-23 17:22:29 +01:00
Laurent Destailleur
7bde781206
Merge pull request #4061 from marcosgdf/bug-3231
...
FIX #3231 [Members] Public subscription page displays GeoIP error
2015-11-21 17:58:29 +01:00
Laurent Destailleur
dc6496fdf3
Merge pull request #4054 from marcosgdf/bug-3508
...
FIX #3508 Useless tooltip in 3.8 boxes
2015-11-21 17:49:09 +01:00
Laurent Destailleur
4481c4f978
Merge pull request #4052 from marcosgdf/bug-4049
...
FIX #4049 PHP warning when trying to access a non-existing product/service
2015-11-21 17:47:03 +01:00
Laurent Destailleur
295d83001a
Merge pull request #4051 from marcosgdf/bug-4018
...
FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined
2015-11-21 17:46:26 +01:00
Laurent Destailleur
54b6ff02c0
Merge pull request #4048 from FHenry/3.8
...
FIX Missing fields managed by update_customer_modtime in 3.8
2015-11-21 17:46:02 +01:00
Marcos García de La Fuente
a456d21249
FIX #3231 [Members] Public subscription page displays GeoIP error
2015-11-21 13:25:09 +01:00
Laurent Destailleur
758b8e1f7e
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/boxes/box_project.php
2015-11-21 12:32:03 +01:00
Laurent Destailleur
c04743aa84
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-11-21 12:23:51 +01:00
Marcos García de La Fuente
3fbe10a578
FIX #3293 Login page form icons not shown
2015-11-21 12:18:29 +01:00
Marcos García de La Fuente
9f27e2323f
FIX #3734 Do not show empty links of deleted source objects in stock movement list
2015-11-21 11:51:23 +01:00
Marcos García de La Fuente
4bf6cf4e65
FIX #3508 Useless tooltip in 3.8 boxes
2015-11-21 11:24:18 +01:00
Marcos García de La Fuente
e8fc5f0d3a
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
2015-11-21 11:00:56 +01:00
Marcos García de La Fuente
eba5832d3a
FIX #4049 PHP warning when trying to access a non-existing product/service
2015-11-21 10:58:58 +01:00
Marcos García de La Fuente
e31a8f25a2
FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined
2015-11-21 10:55:23 +01:00
Florian HENRY
c0d29d2a15
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-21 10:10:42 +01:00
Laurent Destailleur
30f0b6e2e8
Merge pull request #4046 from marcosgdf/bug-4016
...
FIX #4016 User link is not correctly formed in emailing receivers
2015-11-21 02:14:08 +01:00
Laurent Destailleur
94fdff9a46
Merge pull request #4045 from marcosgdf/bug-4043
...
FIX #4043 Incorrect translation in error mesage in menu creation admin page
2015-11-21 02:08:55 +01:00
Laurent Destailleur
45d6635bf6
Merge pull request #4025 from ndrosis/3.8
...
FIX utf-8 characters in the mask mercure does not break counter
2015-11-21 00:26:38 +01:00
Marcos García de La Fuente
2dedea8736
FIX #4016 User link is not correctly formed in emailing receivers
2015-11-20 22:03:44 +01:00
Marcos García de La Fuente
5dba9ef54e
FIX #4043 Incorrect translation in error mesage in menu creation admin page
2015-11-20 22:00:11 +01:00
Drosis Nikos
ee4eb13fff
Update functions2.lib.php
2015-11-20 19:05:00 +02:00
arnaud
07226d32ec
FIX NB task and percent progress in box project
2015-11-20 16:11:48 +01:00
arnaud
4233d24f4b
FIX export with category contact extrafields
2015-11-19 18:01:58 +01:00
Florian HENRY
80f19de223
fix && vs and
2015-11-19 16:32:25 +01:00
Florian HENRY
0c4f7a1b22
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-19 12:55:20 +01:00
Juanjo Menent
a627e32fca
Merge pull request #4034 from fmarcet/3.7
...
FIX Not use localtaxes when invoice some orders
2015-11-18 23:07:24 +01:00
fmarcet
f615927d24
FIX Not use localtaxes when invoice some orders
2015-11-18 17:56:04 +01:00
arnaud
85a58f666a
FIX product link in project box
2015-11-18 17:22:53 +01:00
fmarcet
0cbf8ca1dd
FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO
...
variable is empty or not
2015-11-18 13:59:25 +01:00
Florian HENRY
28196a5fd9
add pgsql function
2015-11-18 12:24:52 +01:00
Nikos Drosis
5082b1cc66
Fix for utf-8 characters in the mask mercure
2015-11-17 20:22:27 +02:00
Laurent Destailleur
508b11733a
Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name
...
FIX 3.8 allow to search on alias name into select
2015-11-16 23:48:18 +01:00
Laurent Destailleur
2f1a1c5111
Merge pull request #4008 from atm-ph/fix_38_trigger_propal_clone
...
FIX can not have access to the new ids or propal lines on PROPAL_CLONE
2015-11-16 23:46:03 +01:00
Laurent Destailleur
835700bb25
Merge pull request #4006 from marcosgdf/bug-3989
...
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
2015-11-16 23:42:38 +01:00
Laurent Destailleur
04ffe1c7f0
Merge pull request #4005 from marcosgdf/bug-3988
...
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
2015-11-16 23:42:04 +01:00
Laurent Destailleur
76eeb0d2f1
Merge pull request #4004 from marcosgdf/bug-3992
...
FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be
2015-11-16 23:41:46 +01:00
Laurent Destailleur
0e511027f6
Merge pull request #4003 from marcosgdf/bug-3996
...
FIX #3996 Dictionnary hooks are not working in 3.8
2015-11-16 23:41:06 +01:00
Laurent Destailleur
9693982f27
Merge pull request #4002 from marcosgdf/bug-3997
...
FIX #3997 Wrong permission key used for Margins > Read all
2015-11-16 23:40:47 +01:00
Laurent Destailleur
d16efbaf24
Merge pull request #3999 from fmarcet/3.8
...
FIX: Can't update line's duration
2015-11-16 23:39:44 +01:00
Alexis Algoud
a7d2bdc2c1
FIX 3.8 allow to search on alias name into select
2015-11-16 19:10:20 +01:00
phf
c21354101f
FIX can not have access to the new ids or propal lines on PROPAL_CLONE
2015-11-16 15:36:02 +01:00
Marcos García de La Fuente
53fb085766
Corrected indent
2015-11-16 13:29:37 +01:00
Marcos García de La Fuente
ec7e4cb3d4
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
2015-11-16 13:25:00 +01:00
Marcos García de La Fuente
0880b13142
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
2015-11-16 13:24:11 +01:00
Marcos García de La Fuente
be460b6cbf
FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be
2015-11-16 13:20:56 +01:00
Marcos García de La Fuente
8e9e2911ae
FIX #3996 Dictionnary hooks are not working in 3.8
2015-11-16 13:18:25 +01:00
