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 |
|
Frédéric FRANCE
|
6c8ac1e95c
|
typo
|
2015-11-19 16:31:55 +01:00 |
|
Frédéric FRANCE
|
3a2cb63575
|
Update list.php
|
2015-11-19 16:20:06 +01:00 |
|
Maxime Kohlhaas
|
9c1545bc1b
|
NEW add info page on product card
|
2015-11-19 14:45:05 +01:00 |
|
Maxime Kohlhaas
|
826592c480
|
Fix info and banner on societe
|
2015-11-19 14:43:00 +01:00 |
|
Maxime Kohlhaas
|
e4125c9802
|
NEW : info function for product card
|
2015-11-19 14:26:32 +01:00 |
|
philippe grand
|
4f280f63d0
|
[Qual] Uniformize code
|
2015-11-19 13:59:58 +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 |
|
aspangaro
|
98d5f21787
|
Debug state
|
2015-11-19 06:21:37 +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 |
|
Juanjo Menent
|
3094f9ed32
|
Merge pull request #4032 from grandoc/develop
[Qual] Uniformize code
|
2015-11-18 23:05:04 +01:00 |
|
Juanjo Menent
|
5218501c04
|
Merge pull request #4024 from defrance/patch-81
bad limittoshow usage
|
2015-11-18 22:31:57 +01:00 |
|
Juanjo Menent
|
9ecdfa8be8
|
Merge pull request #4017 from apachler/develop
added Regions, Departements and Forme Juridique for Austria
|
2015-11-18 22:04:19 +01:00 |
|
Frédéric FRANCE
|
dfdc220c6b
|
Update list.php
|
2015-11-18 18:16:03 +01:00 |
|
Frédéric FRANCE
|
c647ad6425
|
Update list.php
|
2015-11-18 18:15:02 +01:00 |
|
Frédéric FRANCE
|
fe7cc95efd
|
Update list.php
|
2015-11-18 18:13:19 +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 |
|
philippe grand
|
42ed3d2bb7
|
[Qual] Uniformize code
|
2015-11-18 16:05:41 +01:00 |
|
Florian HENRY
|
fbe8a181a9
|
fix pgsql
|
2015-11-18 14:03:25 +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 |
|
Laurent Destailleur
|
735c7b7d68
|
Code comment
|
2015-11-18 13:57:01 +01:00 |
|
Florian HENRY
|
0ffc2a226c
|
fix pg migration script
|
2015-11-18 13:53:04 +01:00 |
|
Laurent Destailleur
|
fbd1d2360f
|
Comment
|
2015-11-18 13:42:38 +01:00 |
|
Laurent Destailleur
|
5c6f7425f1
|
FIX: List of user to assign a task is not visible
|
2015-11-18 13:23:01 +01:00 |
|
Florian HENRY
|
28196a5fd9
|
add pgsql function
|
2015-11-18 12:24:52 +01:00 |
|
aspangaro
|
1e4d8ec104
|
New: HRM #3699 Add address informations in user card
|
2015-11-18 06:34:08 +01:00 |
|
aspangaro
|
ad457b416d
|
Use menu & add mode 'employee' in user/index.php
|
2015-11-17 22:51:34 +01:00 |
|
aspangaro
|
96d97657fd
|
Remove obsolete code
|
2015-11-17 22:17:18 +01:00 |
|
aspangaro
|
258ac45519
|
Remove obsolete code
|
2015-11-17 22:14:39 +01:00 |
|
aspangaro
|
1f9960d1bb
|
Remove info on employee card
|
2015-11-17 21:25:07 +01:00 |
|
aspangaro
|
c7df6c15a2
|
Different display if employee mode
|
2015-11-17 21:22:45 +01:00 |
|
aspangaro
|
b7b25c9682
|
Remove some code
|
2015-11-17 21:04:11 +01:00 |
|
aspangaro
|
a5ca6cb732
|
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
|
2015-11-17 20:34:37 +01:00 |
|
Nikos Drosis
|
5082b1cc66
|
Fix for utf-8 characters in the mask mercure
|
2015-11-17 20:22:27 +02:00 |
|
Laurent Destailleur
|
683ad24ece
|
Take number of entry into top menu to defined the trigger to change size
of top menu thumbs
|
2015-11-17 19:16:40 +01:00 |
|
Laurent Destailleur
|
b1c5768de9
|
NEW Add fields into llx_cronjobs to be able to use job table to queue
one shot jobs.
|
2015-11-17 18:22:39 +01:00 |
|
BENKE Charlie
|
ce367bfa31
|
bad limittoshow usage
the value selected in MAIN_MAXTABS_IN_CARD is not well used (particulary when the active tab is present on tabcollector
|
2015-11-17 14:42:34 +01:00 |
|
Laurent Destailleur
|
6dc6bab556
|
Support of 'small', 'mini' and '' image size everywhere.
|
2015-11-17 10:38:00 +01:00 |
|
Laurent Destailleur
|
86db029cb3
|
Merge pull request #4013 from fappels/develop
Fix migration - remove default for text field
|
2015-11-17 10:06:07 +01:00 |
|
BENKE Charlie
|
4aad7122e0
|
add odt feature on supplier admin page
add odt feature on supplier admin page
|
2015-11-17 10:06:03 +01:00 |
|
BENKE Charlie
|
8630a2d56b
|
add odt feature on supplier admin page
add odt feature on admin page
|
2015-11-17 10:04:13 +01:00 |
|
Andreas Pachler
|
161b75acfc
|
added Regions, Departements and Forme Juridique for Austria
|
2015-11-17 06:56:49 +01:00 |
|
Laurent Destailleur
|
c6e7413349
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-17 00:58:22 +01:00 |
|
Laurent Destailleur
|
f5631cac45
|
NEW Introduce property module_position so a module can decide where it
appears into list of modules.
|
2015-11-17 00:58:12 +01:00 |
|
Paris Liakos
|
fb6819764d
|
Add PRODUCT_DEL_MULTILANGS trigger for translation deletion on product
|
2015-11-17 01:20:58 +02:00 |
|
Laurent Destailleur
|
a8bfa1a258
|
Merge pull request #4011 from ParisLiakos/develop
Add triggers for product and category translation changes
|
2015-11-16 23:50:18 +01: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
|
dbf384ec6b
|
Merge pull request #4000 from fmarcet/develop_bolivia
New: Bolivian regions and departments
|
2015-11-16 23:40:16 +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 |
|
Laurent Destailleur
|
66f24ff400
|
Merge pull request #3983 from grandoc/develop
[Qual] Uniformize code
|
2015-11-16 23:31:40 +01:00 |
|
Laurent Destailleur
|
2fbb030d61
|
Merge pull request #3984 from frederic34/warehouse
Select warehouse on order card
|
2015-11-16 23:31:25 +01:00 |
|
Laurent Destailleur
|
de70321149
|
Merge pull request #3982 from frederic34/imgstatut
Add statut2 icon and adjust some other
|
2015-11-16 23:30:49 +01:00 |
|
Frédéric FRANCE
|
59dd1502de
|
Update list.php
|
2015-11-16 21:29:39 +01:00 |
|
fappels
|
e9be3d19f4
|
Fix migration - remove default for text field
remove default for user_param value text field
lang typo
|
2015-11-16 21:24:08 +01:00 |
|
Paris Liakos
|
146aa7815b
|
Add X_SET_MULTILANGS triggers to make possible reacting on translation changes for products and categories
|
2015-11-16 20:27:51 +02:00 |
|
Alexis Algoud
|
a7d2bdc2c1
|
FIX 3.8 allow to search on alias name into select
|
2015-11-16 19:10:20 +01:00 |
|
Frédéric FRANCE
|
0424a2bb3d
|
Update list.php
|
2015-11-16 16:27:37 +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 |
|
Alexis Algoud
|
55b23c4918
|
FIX add billed field in supplier order
|
2015-11-16 14:55:46 +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 |
|
Marcos García de La Fuente
|
73da011461
|
FIX #3997 Wrong permission key used for Margins > Read all
|
2015-11-16 13:16:54 +01:00 |
|
fmarcet
|
9e51cf66dd
|
New: Bolivian regions and departmens
|
2015-11-16 12:34:59 +01:00 |
|
fmarcet
|
0a92849de3
|
FIX: Can't update line's duration
|
2015-11-16 10:57:47 +01:00 |
|
aspangaro
|
06f752b250
|
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
|
2015-11-16 06:50:04 +01:00 |
|
Frédéric FRANCE
|
ba60313f88
|
Update list.php
|
2015-11-16 00:11:03 +01:00 |
|
Frédéric FRANCE
|
faff8e2cd8
|
Update list.php
|
2015-11-16 00:01:34 +01:00 |
|
Laurent Destailleur
|
dfc01e971f
|
Update files for transifex sync
|
2015-11-15 20:27:43 +01:00 |
|
Florian HENRY
|
c3b7bbfb3b
|
FIX : #3990
|
2015-11-15 20:00:11 +01:00 |
|
Laurent Destailleur
|
7afedd3f8b
|
Minor enhancement of theme MD
|
2015-11-15 19:29:18 +01:00 |
|
Laurent Destailleur
|
6bd6be0912
|
Debug and rename experimental module "supplier proposal". Still work to
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
|
2015-11-15 19:23:39 +01:00 |
|
Laurent Destailleur
|
388748055a
|
Fix missing translation for VAT
|
2015-11-15 15:08:54 +01:00 |
|
frederic34
|
e0ee6718ad
|
Select warehouse on order card
|
2015-11-15 11:42:47 +01:00 |
|
Laurent Destailleur
|
db941d5395
|
NEW Enhance style engine. Add option to set color of links
|
2015-11-15 11:31:09 +01:00 |
|
philippe grand
|
f308606ee1
|
[Qual] Uniformize code
|
2015-11-15 07:47:35 +01:00 |
|
Laurent Destailleur
|
192fdbdcc4
|
Minor look uniformization
|
2015-11-14 23:10:12 +01:00 |
|
Laurent Destailleur
|
c2ec4a4fd2
|
Move online help link at a better place (top right). Link is also always
visible.
|
2015-11-14 22:49:34 +01:00 |
|
Laurent Destailleur
|
6895daa5e9
|
Fix tr/td not correctly open/closed
Fix default value was not set
|
2015-11-14 19:31:50 +01:00 |
|
Laurent Destailleur
|
80127cbbc9
|
Fix tr/td not correctly open/closed
Fix default value was not set
|
2015-11-14 19:31:16 +01:00 |
|
Laurent Destailleur
|
1da53501a1
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-14 17:54:28 +01:00 |
|
Laurent Destailleur
|
01058be44c
|
NEW Introduce a "code" into fiels to describe vat. This will allow to
suggest different vat lines with same value with ability to
differentiate them.
|
2015-11-14 17:53:58 +01:00 |
|
Laurent Destailleur
|
b4af55ab40
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-11-14 14:57:49 +01:00 |
|
Laurent Destailleur
|
b75923871c
|
FIX: Too many information were hidden. A lot of users still need bank
account on PDF.
|
2015-11-14 14:56:44 +01:00 |
|
frederic34
|
488acfd177
|
Add statut2 icon and adjust some other
|
2015-11-14 10:50:26 +01:00 |
|
Laurent Destailleur
|
653fb00a0e
|
Merge pull request #3981 from ParisLiakos/develop
getListOfProductsOrServices() filters are broken
|
2015-11-13 19:47:44 +01:00 |
|
Paris Liakos
|
298a671342
|
getListOfProductsOrServices() filters are broken
|
2015-11-13 20:25:12 +02:00 |
|
Laurent Destailleur
|
5b1e20494b
|
Merge pull request #3977 from FHenry/3.8
FIX : showrefnav htmlspecialchar instead of < >
|
2015-11-13 19:22:41 +01:00 |
|
Laurent Destailleur
|
3ff42a45d4
|
Merge pull request #3976 from atm-alexis/3.9_FIX_htmlname_for_ajax_contact
FIX htmlname parameters wasnt applied
|
2015-11-13 19:22:18 +01:00 |
|
Laurent Destailleur
|
85c0ed39f1
|
Merge pull request #3974 from atm-ph/fix_38_aufocus
FIX autofocus on input search product
|
2015-11-13 19:21:52 +01:00 |
|
Laurent Destailleur
|
510e3bc4c2
|
Merge pull request #3975 from All-3kcis/develop-patch-12
Fix #3542
|
2015-11-13 19:20:24 +01:00 |
|
Florian HENRY
|
2a2155a239
|
FIX : showrefnav htmlspecialchar instead of < >
|
2015-11-13 14:40:52 +01:00 |
|