Laurent Destailleur
|
6763b5baa0
|
Merge pull request #4144 from FHenry/develop
FIX : Cannot change the date of a contract #4088
|
2015-12-03 12:06:48 +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 |
|
Laurent Destailleur
|
540609d5ed
|
Merge pull request #4139 from bafbes/patch-9
Update products.lang - include translation for units key in product/card.php
|
2015-12-03 12:01:10 +01:00 |
|
Laurent Destailleur
|
6b3e20dcdc
|
Merge pull request #4138 from GPCsolutions/dolibarr-4137
Fix #4137 Salaries parameter saving
|
2015-12-03 12:00:47 +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
|
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
|
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
|
33e73afda6
|
FIX : Cannot change the date of a contract #4088
|
2015-12-03 10:51:03 +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
|
2f02919c70
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-03 10:01:51 +01:00 |
|
Laurent Destailleur
|
c664a492e6
|
Removed a not used field making mysql error (reserved word). Also this
field is not required by dolibarr core.
|
2015-12-03 10:01:40 +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
|
9aaab2c1dc
|
Work on select fields on project list
|
2015-12-02 23:20:19 +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 |
|
Bahfir Abbes
|
7841c97387
|
Update products.lang
|
2015-12-02 19:34:02 +01:00 |
|
Bahfir Abbes
|
134adcf637
|
Update products.lang
|
2015-12-02 18:55:51 +01:00 |
|
Raphaël Doursenaud
|
e1d5b4483a
|
Fix #4137 Salaries parameter saving
Button was outside of the form.
|
2015-12-02 18:31:38 +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 |
|
Bahfir Abbes
|
5360ea65bf
|
Update card.php
|
2015-12-01 21:26:04 +01:00 |
|
aspangaro
|
e1c8e6d8f6
|
Remove useless code
|
2015-12-01 20:27:29 +01:00 |
|
aspangaro
|
09a6cc9625
|
wrong table
|
2015-12-01 20:17:14 +01:00 |
|
abb
|
46611908ae
|
add constant FICHINTER_EMPTY_LINE_DESC to allow empty line descriptions in interventions
|
2015-12-01 11:10:05 +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
|
6df4948a73
|
Fix text
|
2015-12-01 03:12:12 +01:00 |
|
Laurent Destailleur
|
357bc7a00c
|
Fix color link
|
2015-11-30 21:40:14 +01:00 |
|
Laurent Destailleur
|
de730c9762
|
NEW Introduce cost price on product.
|
2015-11-30 21:20:45 +01:00 |
|
aspangaro
|
b1122b55d4
|
Fix : accountancy code on finance journal is not a constant
|
2015-11-30 21:07:27 +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
|
62634a1db8
|
Merge pull request #4115 from mrsof/patch-3
FIX: Multiple syntax errors
|
2015-11-30 19:14:37 +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 |
|
Romain DESCHAMPS
|
94101412e9
|
Progress column not wide enough for 100%
Progress column not wide enough for 100%
|
2015-11-30 12:20:14 +01:00 |
|
Laurent Destailleur
|
a12e959833
|
Do not show billed status after order status
|
2015-11-29 16:33:50 +01:00 |
|
Ion Agorria
|
d518b24d55
|
Only print : when both $h and $m are set
|
2015-11-29 16:19:30 +01:00 |
|
Sof
|
1b62cd4481
|
FIX: Multiple syntax errors
|
2015-11-29 16:05:14 +01:00 |
|
Laurent Destailleur
|
c55d11869b
|
Billing of supplier or customer order is a process that can be done in
parallel with shipment or reception, so we show the status on another
field into lists.
|
2015-11-29 15:54:32 +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
|
bb627e32d3
|
Fix: Form should use POST. GET has too much bad side effects.
|
2015-11-29 14:09:22 +01:00 |
|
Laurent Destailleur
|
b0e938fab4
|
Fix missing td cell
|
2015-11-29 13:15:02 +01:00 |
|
Laurent Destailleur
|
480623a6d5
|
Uniformize GUI. All lists must have a search on status at end and last
column is dedicaded to future "mass action checkbox".
|
2015-11-29 13:03:46 +01:00 |
|
Laurent Destailleur
|
b2a2f5b449
|
Merge pull request #4110 from frederic34/patch-5
Update list.php
|
2015-11-29 02:01:20 +01:00 |
|
Laurent Destailleur
|
bbece06b8e
|
Merge pull request #4109 from frederic34/patch-3
Navigation to loan list
|
2015-11-29 02:01:02 +01:00 |
|
Laurent Destailleur
|
ebe4867ab1
|
Remove useless information tomake screen lighter
|
2015-11-29 01:23:41 +01:00 |
|
Laurent Destailleur
|
263be5aa0a
|
Avoid 2 lines on mall screen
|
2015-11-29 01:16:56 +01:00 |
|
Laurent Destailleur
|
7b6d8dd23e
|
Fix for smartphone
|
2015-11-29 01:13:23 +01:00 |
|
Frédéric FRANCE
|
79263d06e9
|
Update index.php
|
2015-11-28 20:37:09 +01:00 |
|
Frédéric FRANCE
|
6d7e360498
|
Update list.php
|
2015-11-28 20:33:18 +01:00 |
|
Laurent Destailleur
|
5df193ec93
|
Uniformize code
|
2015-11-28 20:25:50 +01:00 |
|
Laurent Destailleur
|
5d5cfd498a
|
Add holiday date functions into PHPUnit
|
2015-11-28 19:54:16 +01:00 |
|
Frédéric FRANCE
|
e3443365d2
|
Navigation to loan list
|
2015-11-28 19:08:52 +01:00 |
|
Laurent Destailleur
|
acbbb70c44
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-28 17:36:02 +01:00 |
|
Laurent Destailleur
|
3e403720e6
|
FIX User is selected when choosing menu "My projects"
Graph of opportunities is moved into an include file.
|
2015-11-28 17:35:52 +01:00 |
|
Laurent Destailleur
|
d00ebd54f9
|
Merge pull request #4107 from aspangaro/develop-member
Fix adherent width colomn of create type form
|
2015-11-28 16:32:34 +01:00 |
|
Laurent Destailleur
|
fcdb3af708
|
Merge pull request #4106 from aspangaro/develop-skype
New: Better integration of skype for dolibarr 3.9
|
2015-11-28 16:31:35 +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 |
|
Laurent Destailleur
|
5b22eee938
|
FIX #4099
|
2015-11-28 16:11:15 +01:00 |
|
Laurent Destailleur
|
3485e351a4
|
Fix do not jump to top of page when clicking on "Link to order"
|
2015-11-28 15:46:20 +01:00 |
|
Laurent Destailleur
|
826c4de26b
|
Uniformize and debug module expense report.
|
2015-11-28 15:28:59 +01:00 |
|
aspangaro
|
8bf66d2f58
|
Remove skype also in member card - already present in dol_banner
|
2015-11-28 15:09:08 +01:00 |
|
aspangaro
|
0a3ab4617c
|
Fix adherent width colomn of create type form
|
2015-11-28 14:52:13 +01:00 |
|
aspangaro
|
d12e3ca91f
|
Finish work on better integration of skype
|
2015-11-28 14:43:16 +01:00 |
|
Laurent Destailleur
|
88e76dcf64
|
Fix utf8 encoded twice
|
2015-11-28 14:40:23 +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
|
9817ce8b20
|
Merge remote-tracking branch 'Upstream/develop' into develop-skype
|
2015-11-26 07:12:04 +01:00 |
|
aspangaro
|
cb6038e125
|
Better code for admin skype
|
2015-11-26 07:10:13 +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
|
b47dbc7a5f
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/install/pgsql/functions/functions.sql
htdocs/projet/element.php
|
2015-11-26 01:32:21 +01:00 |
|
Laurent Destailleur
|
f814bc11a0
|
Clean packaging
|
2015-11-26 01:27:59 +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
|
a454e92656
|
Increase size of combo list
|
2015-11-26 00:31:12 +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
|
02ac828e4c
|
Merge pull request #4075 from GPCsolutions/dolibarr-4074
Fix #4074 Properly save user theme settings
|
2015-11-25 23:51:30 +01:00 |
|
Laurent Destailleur
|
f79aeeeb0b
|
Merge pull request #4068 from aspangaro/develop-accountancy
Fix: typo on finance journal
|
2015-11-25 23:33:29 +01:00 |
|
Laurent Destailleur
|
8746ee1310
|
Merge pull request #4067 from aspangaro/develop-donation
NEW: Donation complete cerfa 11580*03 Fr - Thanks Benoit21
|
2015-11-25 23:33:13 +01:00 |
|
Laurent Destailleur
|
9d10533f3d
|
Merge pull request #4066 from aspangaro/develop-hrm
Fix: Auguria Menu & wrong table in dictionary HRM
|
2015-11-25 23:32:36 +01:00 |
|
Laurent Destailleur
|
ad087a75e6
|
Fix missing php
|
2015-11-25 23:32:00 +01:00 |
|
Laurent Destailleur
|
66a1becbf9
|
Merge pull request #4065 from frederic34/patch-5
Typo
|
2015-11-25 23:21:39 +01:00 |
|
Laurent Destailleur
|
2d8c2221d8
|
NEW Provide an easier way to understand if an order can be shipped.
|
2015-11-25 23:20:41 +01:00 |
|
Laurent Destailleur
|
28c77cbb49
|
Merge pull request #3994 from frederic34/patch-3
Not shippable if quantity in all order are greater than in stock
|
2015-11-25 22:26:15 +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 |
|
aspangaro
|
3457a732f5
|
New: Better integration of skype
|
2015-11-25 20:19:18 +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 |
|
Laurent Destailleur
|
1d9e9ccaba
|
NEW Add filter on status on shipments
|
2015-11-25 17:34:26 +01:00 |
|
Laurent Destailleur
|
cf98c7a6f5
|
Police plus grande
|
2015-11-25 17:11:08 +01:00 |
|
Laurent Destailleur
|
2593022684
|
Fix bad css
|
2015-11-25 16:45:25 +01:00 |
|
Laurent Destailleur
|
5568ff1c54
|
Fix bad picto on export
|
2015-11-25 16:41:40 +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 |
|
Raphaël Doursenaud
|
231196437c
|
Fix #4074 Properly save user theme settings
|
2015-11-23 14:21:25 +01:00 |
|
Laurent Destailleur
|
a1824955f6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-23 12:21:02 +01:00 |
|
Laurent Destailleur
|
12358c9721
|
FIX The import help was not visible on calculated fields
|
2015-11-23 12:20:43 +01:00 |
|
Laurent Destailleur
|
61b46352b7
|
Dash line was not visible.
|
2015-11-23 09:36:34 +01:00 |
|
aspangaro
|
0899e7392b
|
Fix: typo on finance journal
|
2015-11-22 22:11:22 +01:00 |
|
aspangaro
|
71189248d9
|
Correct description
|
2015-11-22 21:35:19 +01:00 |
|
aspangaro
|
5bed70b04e
|
New: Donation complete cerfa 11580*03 Fr - Thanks Benoit21
|
2015-11-22 21:31:05 +01:00 |
|
aspangaro
|
f9e82721d7
|
Fix: Auguria Menu & wrong table in dictionary HRM
|
2015-11-22 20:13:48 +01:00 |
|
Frédéric FRANCE
|
3d05b53a62
|
Typo
|
2015-11-22 19:08:38 +01:00 |
|
Laurent Destailleur
|
ffeae34f51
|
Update doc
|
2015-11-22 18:41:35 +01:00 |
|
Laurent Destailleur
|
0c958521ac
|
Fix cleaning of lines was not working
|
2015-11-22 17:46:25 +01:00 |
|
Laurent Destailleur
|
73bcc3bfe3
|
The temp dir for cache used by rester is correctly managed: No temp or
data files must be stored outside of documents directory.
|
2015-11-22 17:39:13 +01:00 |
|
Laurent Destailleur
|
296e04022f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-22 17:19:45 +01:00 |
|
Laurent Destailleur
|
99fa751edc
|
Test lib is available
|
2015-11-22 17:19:20 +01:00 |
|
Laurent Destailleur
|
3c55479705
|
Restler #3544
|
2015-11-22 17:17:06 +01:00 |
|
Laurent Destailleur
|
3aa25cd2be
|
Merge pull request #4064 from frederic34/escpos
Add profile escpos printer
|
2015-11-22 17:09:15 +01:00 |
|
Laurent Destailleur
|
91f1acd1f1
|
Merge pull request #4063 from grandoc/develop
fix : Typo and translation
|
2015-11-22 17:07:22 +01:00 |
|
Laurent Destailleur
|
3f87b30327
|
Use same way to obfuscate key than password
|
2015-11-22 14:21:12 +01:00 |
|
frederic34
|
6b4b70bdbb
|
translations and help
|
2015-11-22 14:11:33 +01:00 |
|
Laurent Destailleur
|
a94aedb171
|
Minor css fix
|
2015-11-22 12:33:56 +01:00 |
|
Laurent Destailleur
|
cb3765bc92
|
Debug module Resource
|
2015-11-22 12:23:10 +01:00 |
|
Laurent Destailleur
|
e438d76df9
|
NEW Option encrypt password into databae is set to on by default on
first install.
|
2015-11-22 11:32:31 +01:00 |
|
frederic34
|
bfd97d5226
|
Add profile escpos printer
|
2015-11-22 11:04:27 +01:00 |
|
philippe grand
|
f4c8b5e7f8
|
missing translation
|
2015-11-22 10:46:17 +01:00 |
|
philippe grand
|
210c6c67cd
|
better translation and missing translation
|
2015-11-22 10:40:04 +01:00 |
|
philippe grand
|
9cdf0f427e
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2015-11-22 10:15:57 +01:00 |
|
Laurent Destailleur
|
c7447b0899
|
Add thirdparty of project into project summary of project home page.
Total use a different color
|
2015-11-21 20:25:28 +01:00 |
|
Laurent Destailleur
|
6f7a3f2c66
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-21 20:00:50 +01:00 |
|
Laurent Destailleur
|
e3c6e4ebe5
|
NEW Add planned workload and declared progress on project summary list
on project home page (data aggregated from tasks of project)
|
2015-11-21 20:00:38 +01:00 |
|
philippe grand
|
0408e309f8
|
fix : Typo and translation
|
2015-11-21 19:13:34 +01:00 |
|
Laurent Destailleur
|
7b0a9fabab
|
FIX Order last name / firstname in user list must be done according to
option
|
2015-11-21 18:26:25 +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
|
c8cf06c14b
|
Merge pull request #4059 from fappels/develop_fix_defineBuyPrice
Fix defineBuyPrice no min price is not error
|
2015-11-21 17:53:59 +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 |
|
philippe grand
|
e78794cab2
|
[Qual] Uniformize code
|
2015-11-21 17:38:09 +01:00 |
|
philippe grand
|
55bab28b9c
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2015-11-21 17:15:56 +01:00 |
|
Laurent Destailleur
|
c15c0f6fbb
|
Minor css fix
|
2015-11-21 15:31:27 +01:00 |
|
Laurent Destailleur
|
548ff26628
|
Focus on textarea works also when ckeditor is on
|
2015-11-21 13:42:01 +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
|
2a345b6fc0
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
|
2015-11-21 12:48:41 +01:00 |
|
fappels
|
ecd3114683
|
Fix defineBuyPrice no min price is not error
No min buy price is not error, return 0 if no buyprice set
|
2015-11-21 12:35:45 +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 |
|
philippe grand
|
32f420eefa
|
[Qual] Uniformize code
|
2015-11-21 05:20:08 +01:00 |
|
philippe grand
|
928c44b04f
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2015-11-21 04:52:19 +01:00 |
|
Laurent Destailleur
|
69757210ce
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-21 02:40:21 +01:00 |
|
Laurent Destailleur
|
2eba3c9e81
|
Comment
|
2015-11-21 02:39:49 +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
|
bfaa8d539f
|
Merge pull request #4039 from frederic34/patch-9
typo
|
2015-11-21 01:51:56 +01:00 |
|
Laurent Destailleur
|
60724df496
|
Merge pull request #4038 from atm-maxime/develop
NEW add info page on product card
|
2015-11-21 01:51:32 +01:00 |
|
Laurent Destailleur
|
9db71098ac
|
Merge pull request #4031 from FHenry/develop
PG SQL
|
2015-11-21 01:50:47 +01:00 |
|
Laurent Destailleur
|
1bea9917c4
|
Introduce version on resource link, so no cache effect after upgrading
|
2015-11-21 00:52:20 +01:00 |
|
Laurent Destailleur
|
a79e8d33f1
|
FIX Bad meteo icon
|
2015-11-21 00:43:35 +01:00 |
|
Laurent Destailleur
|
97dc4c346b
|
Merge pull request #4026 from aspangaro/develop-hrm
New: FR #3699 HRM Add address informations in user card
|
2015-11-21 00:27:29 +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 |
|
Laurent Destailleur
|
611d8f3e86
|
Merge pull request #4021 from defrance/patch-75
add odt feature on supplier admin page
|
2015-11-21 00:24:15 +01:00 |
|
Laurent Destailleur
|
a906774595
|
Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order
NEW 3.9 add billed status for supplier order
|
2015-11-21 00:20:17 +01:00 |
|
Laurent Destailleur
|
bf2af33b89
|
Merge pull request #4015 from ParisLiakos/develop
Add a trigger for product translation deletion
|
2015-11-21 00:19:40 +01:00 |
|
Laurent Destailleur
|
925b6a7c98
|
Merge pull request #4014 from frederic34/patch-8
Update list.php
|
2015-11-21 00:18:42 +01:00 |
|
Laurent Destailleur
|
5e0b5cb75d
|
Merge pull request #4009 from frederic34/patch-7
Update list.php
|
2015-11-21 00:18:29 +01:00 |
|
Laurent Destailleur
|
e12760bb48
|
Merge pull request #3995 from frederic34/patch-5
Update list.php
|
2015-11-21 00:18:14 +01:00 |
|
Laurent Destailleur
|
552ecbcd95
|
Merge pull request #3964 from aspangaro/develop-hrm3
HRM : Work in progress
|
2015-11-21 00:14:41 +01:00 |
|
Laurent Destailleur
|
401b2a7389
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/theme/md/style.css.php
|
2015-11-20 23:47:07 +01:00 |
|
Laurent Destailleur
|
db27e08b7d
|
Work on md style
|
2015-11-20 23:45:31 +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 |
|
Florian HENRY
|
b8af7625ff
|
fix new extrafields feature
|
2015-11-20 15:29:31 +01:00 |
|
Florian HENRY
|
87c9132a6d
|
avoid error
|
2015-11-20 13:59:58 +01:00 |
|
Florian HENRY
|
101b45e397
|
Continue extrafeild $ID$ and select feature
|
2015-11-20 13:52:47 +01:00 |
|
Florian HENRY
|
b8cab9f4d9
|
continue extrafeild $ID$ and SELECT feature
|
2015-11-20 13:51:57 +01:00 |
|
Florian HENRY
|
4ff0c22e29
|
continue extrafield ID filter
|
2015-11-20 13:22:45 +01:00 |
|
Florian HENRY
|
eac28076c9
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-20 11:59:39 +01:00 |
|
Florian HENRY
|
1566be35a1
|
NEW : add $ID$ into extrafields management to allow use current object
id on filter for select list from table and checkbox list from table
|
2015-11-20 11:59:28 +01:00 |
|
arnaud
|
4233d24f4b
|
FIX export with category contact extrafields
|
2015-11-19 18:01:58 +01:00 |
|
Frédéric FRANCE
|
47485b39ce
|
Update commande.class.php
|
2015-11-19 16:41:11 +01:00 |
|
Florian HENRY
|
80f19de223
|
fix && vs and
|
2015-11-19 16:32:25 +01:00 |
|