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 |
|
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 |
|
Laurent Destailleur
|
a7020506aa
|
Merge pull request #4123 from aspangaro/3.7-accountancy
Fix : accountancy code on finance journal is not a constant
|
2015-12-03 11:55:08 +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
|
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 |
|
fappels
|
38957f7fb7
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8
|
2015-11-29 15:15:31 +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
|
901f952cb9
|
Merge pull request #4103 from frederic34/patch-3
FIX: Navigation to resource list
|
2015-11-28 16:27:58 +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
|
ae87a270e4
|
Merge pull request #4101 from aspangaro/3.7-accountancy
Fix #4069 Accountancy - button "export" don't work on finance journal
|
2015-11-28 16:26:36 +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
|
041fa8d3f3
|
Merge pull request #4083 from GPCsolutions/3.6-4081
FIX #4081 Added missing translation
|
2015-11-26 00:16:46 +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
|
85d788d43a
|
Fix crazy phpcs test
|
2015-11-25 23:26:31 +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 |
|
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
|
d64664f5a7
|
Merge pull request #4057 from marcosgdf/bug-3734
FIX #3734 Do not show empty links of deleted source objects in stock movement list
|
2015-11-21 17:49:41 +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 |
|