Ion Agorria
bbfd138896
Missed another CKEDITOR ref
2015-12-09 18:00:05 +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
Florian HENRY
96a95d6ae1
Debug accountancy on 3.9
2015-12-09 12:55:08 +01:00
Ion Agorria
238f977002
JS error preventing hiding of dates at object line
...
The "if (CKEDITOR)" gives "ReferenceError: CKEDITOR is not defined" at JS console causing the next code to don't execute, is this code obsolete?
2015-12-08 15:45:24 +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
Raphaël Doursenaud
2cf36d157f
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:24:24 +01:00
Laurent Léonard
05234390f2
Fix uniqueness of objects reference
2015-12-07 02:02:03 +01:00
Laurent Destailleur
7f3531a04c
Enhance script to track duplicate translation string and use it to
...
remove around 50 duplicates.
2015-12-06 13:34:57 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
Laurent Destailleur
ff4f1e7a5b
Debug 3.9
2015-12-05 19:20:39 +01:00
Laurent Destailleur
4a2bda3491
Look enhancement
2015-12-04 23:25:34 +01:00
Laurent Destailleur
5cd43d2df0
Some debug on new features
2015-12-04 20:51:34 +01:00
Laurent Destailleur
eb795a7a9d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-04 18:39:39 +01:00
Laurent Destailleur
8c03e46a83
Removed a TODO
2015-12-04 18:33:57 +01:00
Laurent Destailleur
d0d7e83929
Merge pull request #4149 from GPCsolutions/dolibarr-php7
...
[Qual] OOP detection of PHP MySQL driver
2015-12-04 18:25:14 +01:00
Laurent Destailleur
6542da404e
Merge pull request #4129 from aspangaro/develop-bank
...
New HRM Add bank tab in user to pay salary or expense report
2015-12-04 18:23:47 +01:00
Laurent Destailleur
bcadc33e31
Debug visibility on task/projects
2015-12-04 15:37:28 +01:00
aspangaro
6598ac6745
Add rights to see tab (hrm->employee->read)
2015-12-04 12:48:36 +01:00
aspangaro
c30728326e
Merge remote-tracking branch 'Upstream/develop' into develop-bank
2015-12-04 12:41:51 +01:00
Laurent Destailleur
e6ebc9c293
More complete tooltip help
2015-12-04 12:24:36 +01:00
Laurent Destailleur
a24cbf5585
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-04 12:12:23 +01:00
Laurent Destailleur
4dd1cb3e77
Theme MD looks ready for 3.9 now.
2015-12-04 12:12:12 +01:00
Laurent Destailleur
2b149aa514
Merge pull request #4148 from AlainRnet/develop
...
Update fraise.modules.php
2015-12-04 10:31:34 +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
Raphaël Doursenaud
b45d4a2a51
[Qual] OOP detection of PHP MySQL driver
2015-12-03 22:31:13 +01:00
AlainRnet
ebc1105b5c
Update fraise.modules.php
...
following discussion with eldy (https://github.com/Dolibarr/dolibarr/pull/4079#issuecomment-161601400 ) to mix a french forum membre to select mailing member by type, I try to update this selector to integrate selection by type.
Thanks in advance for feedback
2015-12-03 21:09:09 +01:00
Laurent Destailleur
43ab23ca28
Fix doxygen
2015-12-03 14:54:39 +01:00
Laurent Destailleur
1658bee81c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-03 13:06:37 +01:00
Laurent Destailleur
480a398f36
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/holiday/card.php
htdocs/resource/list.php
2015-12-03 13:06:20 +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
c088de517e
Merge pull request #4140 from GPCsolutions/dolibarr-sql
...
[Qual] More robust sorting
2015-12-03 12:06:01 +01:00
Florian HENRY
10a925f7b4
FIX: WHERE 1=1
2015-12-03 11:52:41 +01:00
Laurent Destailleur
63879c1ca6
Merge pull request #4122 from mrsof/patch-7
...
FIX: Cannot set property '_renderItem of undefined
2015-12-03 11:52:30 +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
281eaf2987
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-03 10:27:23 +01:00
Laurent Destailleur
cb8227f086
Fix syntax error
2015-12-03 10:04:13 +01:00
Laurent Destailleur
055e650adf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-02 23:23:38 +01:00
Laurent Destailleur
574b270da0
Work on the "mass action" feature. Can run mass action on
...
result of a select.
2015-12-02 22:00:39 +01:00
Raphaël Doursenaud
0c5c762c1c
[Qual] More robust sorting
...
Only allow valid values and discard others.
Do not use user supplied data in SQL query.
2015-12-02 21:15:59 +01:00
Florian HENRY
bd632cf2b0
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-02 12:12:26 +01:00
aspangaro
882b66c586
HRM - Add bank tab in user to pay salary or expense report
2015-12-01 06:56:26 +01:00
Laurent Destailleur
de730c9762
NEW Introduce cost price on product.
2015-11-30 21:20:45 +01:00
Sof
daa8399764
FIX: Cannot set property '_renderItem of undefined
...
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
2015-11-30 20:31:42 +01:00
Sof
292d3ba959
FIX: Cannot set property '_renderItem of undefined
...
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
2015-11-30 20:28:36 +01:00
Laurent Destailleur
d6d2a2fadb
Merge pull request #4118 from patas-monkey/patch-1
...
Progress column not wide enough for 100%
2015-11-30 19:16:54 +01:00
Laurent Destailleur
863f81160f
Merge pull request #4116 from IonAgorria/patch-2
...
Only print : when both $h and $m are set
2015-11-30 18:54:50 +01:00
Sof
09b61fd185
Update extrafields.class.php
2015-11-30 18:06:15 +01:00
Sof
5dab92836b
FIX: Warning: implode(): Invalid arguments passed
...
Declare array type before implode to avoid warning
2015-11-30 12:27:58 +01:00
