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
Laurent Destailleur
8068d01cfc
Add style maxwidth150
2015-11-13 14:16:45 +01:00
Laurent Destailleur
5e67eefff3
Removed phpcs warning
2015-11-13 12:48:17 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Alexis Algoud
965de406d3
FIX htmlname parameters wasnt applied
2015-11-13 11:47:15 +01:00
Laurent Destailleur
bad28c6d92
Fi sntax error
2015-11-13 11:44:55 +01:00
Laurent Destailleur
eac80d7db4
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
2015-11-13 11:43:29 +01:00
All-3kcis
c59482fea1
Fix #3542
2015-11-13 11:17:23 +01:00
Laurent Destailleur
c7546dbad2
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-11-13 11:13:04 +01:00
Laurent Destailleur
b3be7f65cd
Fix syntax error . = instead of .=
2015-11-13 11:12:49 +01:00
Laurent Destailleur
682842f15f
Fix into title of login page, we must report the tru dolibarr version
...
after the @ (technical information), event if application name/version
was replaced with a constant.
2015-11-13 10:37:51 +01:00
phf
81a8933256
FIX autofocus on input search product
2015-11-13 10:36:32 +01:00
aspangaro
0f75d76296
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-13 07:52:44 +01:00
Laurent Destailleur
9a98206d5a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-13 03:36:08 +01:00
Laurent Destailleur
64c783623b
NEW Framework feature. To have a page being loaded at same scrollbar
...
level wafter a click on a href link, just add the class "reposition" on
this link.
2015-11-13 03:35:55 +01:00
Laurent Destailleur
778941b549
Merge pull request #3948 from marcosgdf/missing-changes
...
Missing changes of PR #3927
2015-11-13 02:29:56 +01:00
Laurent Destailleur
7d9fde803b
Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter
...
NEW Develop multi type event filter
2015-11-13 02:27:53 +01:00
Laurent Destailleur
471bcdd29f
Remove hard coded list of permissions.
2015-11-13 02:21:27 +01:00
Laurent Destailleur
ea6fe02f18
Merge pull request #3923 from altatof/customerinfos
...
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
2015-11-13 00:35:39 +01:00
Laurent Destailleur
0ca9027459
Merge pull request #3973 from frederic34/patch-3
...
llx_accounting_account ADD INDEX account_number
2015-11-13 00:34:02 +01:00
Laurent Destailleur
e2e804e37a
Minor fix
2015-11-13 00:30:10 +01:00
Laurent Destailleur
4065b3f1df
Better management of the Dolibarr tracking id into email.
...
This will allow an imap scanner to link email
2015-11-13 00:19:11 +01:00
Laurent Destailleur
74a4006a84
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-12 21:25:30 +01:00
Laurent Destailleur
b2285ca5e0
Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
...
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Laurent Destailleur
60535086d4
Merge pull request #3965 from jpfox/patch-2
...
Correct pattern to match all odt var tags
2015-11-12 18:32:45 +01:00
Laurent Destailleur
816bacc37e
Merge pull request #3968 from atm-arnaud/3.8_fix_export_extrafield_propal_order
...
FIX export propal and order with extrafields
2015-11-12 18:31:59 +01:00
Frédéric FRANCE
bab41e40e7
Update 3.8.0-3.9.0.sql
2015-11-12 17:50:52 +01:00
Frédéric FRANCE
bd7687b6ab
Update llx_accounting_account.key.sql
2015-11-12 17:47:08 +01:00
Laurent Destailleur
924db5b8aa
Merge pull request #3969 from FHenry/3.8
...
FIX : better fix for #3805
2015-11-12 15:08:34 +01:00
Laurent Destailleur
8925717bbe
Merge pull request #3966 from atm-ph/fix_38_title_actioncomm
...
FIX mail isn't display in title on event in mode view
2015-11-12 15:07:29 +01:00
Laurent Destailleur
8a26e27ef3
Merge pull request #3967 from grandoc/develop
...
[Qual] Uniformize code
2015-11-12 15:01:20 +01:00
Laurent Destailleur
9a9be97c2c
Add a log to help diagnose bad usage of method ad of event
2015-11-12 14:36:35 +01:00
Regis Houssin
52bd90f950
Fix: wrong var name
2015-11-12 14:12:56 +01:00
Florian HENRY
019575d9ed
FIX : better fix for #3805
2015-11-12 13:21:35 +01:00
arnaud
aaa6f00d11
FIX export propal and order with extrafields
2015-11-12 12:37:04 +01:00
Laurent Destailleur
f49a33b600
Try a change for better compatibility with old search form
2015-11-12 12:22:21 +01:00
philippe grand
c712532bf6
[Qual] Uniformize code
2015-11-12 11:59:15 +01:00
phf
f041c017e9
FIX mail isn't display in title on event in mode view
2015-11-12 11:30:44 +01:00
Marcos García de La Fuente
3c42df935d
Corrected HTML closing tag
2015-11-12 10:26:05 +01:00
Jean-Pierre Morfin
0cb9cc2213
Correct pattern to match all odt var tags
...
some vars like {object_total_vat_local_x.y} or {object_total_vat_local_x,y} could not be tested to know if they were existing with [!-- IF {xxx} --] syntax
2015-11-12 09:24:04 +01:00
Alexis Algoud
d997ac83e7
Add function param description
2015-11-12 09:08:08 +01:00
Alexis Algoud
a2c8c7c20e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-12 09:05:26 +01:00
aspangaro
30c4f1c896
HRM : language
2015-11-12 07:40:46 +01:00
aspangaro
bedba7ffb7
HRM: add a mode 'employee' for development to show tab
2015-11-12 07:26:51 +01:00
aspangaro
154f88a58c
HRM: Copy info from user
2015-11-12 07:24:52 +01:00
aspangaro
7693b407e8
HRM: Begin to work on employee card
2015-11-12 06:59:40 +01:00
aspangaro
20872498ba
HRM: Add a tab for holiday module in employee card
2015-11-12 06:58:26 +01:00
aspangaro
4ce6287d52
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-12 05:51:12 +01:00
aspangaro
f602e1fba7
HRM : Add an email address in admin to prevent HRM external service (public accountant for exemple)
2015-11-12 05:48:56 +01:00
Laurent Destailleur
2bd0f04d8f
Add feature to get nb of top menu entrie
...
Fix translation of units
2015-11-12 00:48:37 +01:00
Laurent Destailleur
1f4742b77b
Remove useles html generated code. More code comment.
2015-11-11 19:38:19 +01:00
Laurent Destailleur
cb29f91434
FIX An external libray must contains also non obfuscated code into
...
source
2015-11-11 19:11:43 +01:00
Laurent Destailleur
327d764284
Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr
...
into GPCsolutions-dolibarr-php7
Conflicts:
.gitignore
2015-11-11 19:03:36 +01:00
Laurent Destailleur
9ee06e8f0d
Merge pull request #3951 from frederic34/fccard
...
add messages
2015-11-11 18:32:30 +01:00
Laurent Destailleur
f6a9597507
Merge pull request #3959 from aspangaro/develop-hrm
...
HRM: Correct getNomUrl
2015-11-11 18:32:14 +01:00
Laurent Destailleur
ca62689a96
Merge pull request #3961 from frederic34/escpos
...
Escpos : install lib with composer
2015-11-11 18:30:57 +01:00
frederic34
954291ae0b
re-add library escpos
2015-11-11 18:02:47 +01:00
frederic34
765e83d456
delete directory
2015-11-11 18:01:13 +01:00
frederic34
cd738ef483
Merge remote branch 'upstream/develop' into fccard
...
Conflicts:
htdocs/commande/card.php
2015-11-11 17:23:37 +01:00
frederic34
01d4bd6cf5
bad invert
2015-11-11 17:19:53 +01:00
Laurent Destailleur
21ca7dc823
Merge pull request #3960 from aspangaro/develop-hrm2
...
HRM: Add fk_establishment in llx_user to link an user to an establish…
2015-11-11 17:08:42 +01:00
Laurent Destailleur
59a79442b0
Enhance code for select field list feature.
...
Add gender and employee on user list.
2015-11-11 17:05:18 +01:00
Laurent Destailleur
4ddfa6e1b5
Merge pull request #3956 from frederic34/patch-3
...
Update product.php
2015-11-11 15:51:09 +01:00
Laurent Destailleur
a0606cece9
Merge pull request #3955 from grandoc/develop
...
[Qual] Uniformize code
2015-11-11 15:50:48 +01:00
Christophe Battarel
cc35f2b738
Merge branch 'develop' into customerinfos
2015-11-11 15:46:22 +01:00
aspangaro
05b0ab2eab
HRM: Add fk_establishment in llx_user to link an user to an establishment
2015-11-11 15:45:55 +01:00
aspangaro
bbab5e5bc3
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
2015-11-11 15:38:52 +01:00
Laurent Destailleur
e673b18871
Merge pull request #3949 from marcosgdf/bug-3865
...
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
2015-11-11 15:36:34 +01:00
Christophe Battarel
0c40a6dda5
add hidden constant
2015-11-11 15:32:42 +01:00
aspangaro
54091a0661
Correct getNomUrl
2015-11-11 15:31:39 +01:00
philippe grand
12c5d02a7a
[Qual] Uniformize code
2015-11-11 12:27:09 +01:00
aspangaro
e157d8b8d2
Update for fk_country
2015-11-11 08:52:28 +01:00
aspangaro
ca0c68a8e2
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
2015-11-11 08:20:12 +01:00
aspangaro
e1b329e80a
HRM: Update work
2015-11-11 08:16:06 +01:00
Frédéric FRANCE
2799dbf45b
Update product.php
2015-11-10 23:02:54 +01:00
philippe grand
d06a445e01
[Qual] Uniformize code
2015-11-10 19:22:27 +01:00
Laurent Destailleur
13a0fa2c69
Missing css
2015-11-10 15:50:13 +01:00
Laurent Destailleur
b0419557b1
Exclude dir
2015-11-10 00:37:30 +01:00
Laurent Destailleur
98c32fa1ec
FIX The label hidden was not supported when using jmobile
2015-11-10 00:36:33 +01:00
Alexis Algoud
99513ac9f3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-09 18:31:21 +01:00
frederic34
b8a84d68ec
add messages
2015-11-09 18:19:10 +01:00
Alexis Algoud
68cbd4699b
NEW multi event type for filter and get form in order to allow bookmark
2015-11-09 17:18:23 +01:00
Laurent Destailleur
19684f9a36
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-09 16:48:41 +01:00
Laurent Destailleur
f49fab8a7e
Rename some files in english and increase fields size.
2015-11-09 16:48:30 +01:00
Raphaël Doursenaud
c3ed30ffd8
Moved to new package for TCPDF
...
Previous one has been deprecated by upstream
2015-11-09 12:21:08 +01:00
Raphaël Doursenaud
e5915ce8d9
Upgraded PHPExcel to v1.8.1
...
Fixes issues with PHP 7
2015-11-09 12:19:48 +01:00
Raphaël Doursenaud
0e155be4e8
Reinstall ckeditor with composer
...
This time using the correct full package
Also used the branch + tag commit to work around that bug:
https://github.com/ckeditor/ckeditor-releases/issues/41
2015-11-09 12:18:50 +01:00
Raphaël Doursenaud
442431704b
Upgraded ADOdb Date to v0.36
...
Extracted from ADOdb v5.19
Fixes PHP 7 fatal error
2015-11-09 12:16:04 +01:00
Raphaël Doursenaud
7c44198022
[Qual] Prevent GIT submodules in composer deps
...
Dependencies installed with composer should not be added as submodules.
Restored missing Escpos-php library.
2015-11-09 12:12:05 +01:00
Marcos García de La Fuente
80ef746348
Reverted unwanted changes
2015-11-08 19:23:02 +01:00
Laurent Destailleur
71fa347e8e
FIX Better compatibility for users that used the not supported option
...
MAIN_USE_JQUERY_MULTISELECT set to 1.
2015-11-08 18:40:12 +01:00
Marcos García de La Fuente
9cdf45e0a6
Fixed JS compatibility with multiprices price generator
2015-11-08 16:54:54 +01:00
Marcos García de La Fuente
9bc4b9f0bc
Moved update function after updatePrice
2015-11-08 16:45:42 +01:00
Marcos García de La Fuente
7ebe032d6f
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
...
Close #3865
2015-11-08 16:01:12 +01:00
Laurent Destailleur
096ec3100d
Merge pull request #3926 from frederic34/fccard
...
allow chaining and remove header exit
2015-11-08 15:49:33 +01:00
Laurent Destailleur
6ec33a94c6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-08 15:39:10 +01:00
Laurent Destailleur
bd56396394
Fix migration error
2015-11-08 15:38:57 +01:00
Marcos García de La Fuente
7f0d81d255
Missing changes of PR #3927
2015-11-08 15:12:31 +01:00
Marcos García de La Fuente
04243510f3
Little changes
2015-11-08 14:54:29 +01:00
Laurent Destailleur
e6ab6bdb8e
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-11-08 14:38:01 +01:00
Laurent Destailleur
7a0206adce
FIX Missing to set context into workflow actions, so triggers can't know
...
we are creating an invoice from order or an order from a proposal.
2015-11-08 14:37:50 +01:00
Juanjo Menent
0ce7cad48c
Merge pull request #3946 from aspangaro/3.7-1
...
Fix: Accountancy compatibility with subtotal & jalon module
2015-11-08 11:26:06 +01:00
Juanjo Menent
8eb74b5bd4
Merge pull request #3945 from grandoc/develop
...
[Qual] Uniformize code
2015-11-08 11:25:11 +01:00
Juanjo Menent
7673a73a65
Merge pull request #3939 from marcosgdf/bug-3836
...
FIX #3836 Unable to upload a document to an invoice under some circunstances
2015-11-08 11:21:16 +01:00
Juanjo Menent
59b3124d7d
Merge pull request #3938 from marcosgdf/fr-3876
...
NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2
2015-11-08 11:20:36 +01:00
Juanjo Menent
f15e83e918
Merge pull request #3937 from marcosgdf/bug-3877
...
FIX #3877 HTML encoded strings when searching for a supplier invoice
2015-11-08 11:19:49 +01:00
Juanjo Menent
509b45a0d0
Merge pull request #3936 from marcosgdf/bug-3931
...
FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
2015-11-08 11:19:13 +01:00
Juanjo Menent
77284982d5
Merge pull request #3935 from marcosgdf/bug-3897
...
FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates
2015-11-08 11:18:29 +01:00
Juanjo Menent
8377d6967a
Merge pull request #3934 from marcosgdf/bug-3679
...
FIX #3679 Error when deleting a Localtax2 special payment
2015-11-08 11:16:07 +01:00
Juanjo Menent
a6f0baefc1
Merge pull request #3933 from marcosgdf/bug-3980
...
FIX #3890 Expected transactions bank account page, shows negative numbers
2015-11-08 11:15:31 +01:00
Juanjo Menent
9e11289f5b
Merge pull request #3927 from marcosgdf/fr-3767
...
NEW #3767 Allow changing multiple prices of a product at once
2015-11-08 11:13:04 +01:00
Juanjo Menent
a02100e3c7
Merge pull request #3924 from atm-gauthier/develop_fix_script_creation
...
FIX : wrong coma in llx_opensurvey_sondage.sql creation script
2015-11-08 11:03:26 +01:00
aspangaro
f0a3bca4c2
Fix: Accountancy compatibility with subtotal & jalon module
2015-11-08 04:22:49 +01:00
Laurent Destailleur
1d2dab63a3
More space
2015-11-08 02:32:22 +01:00
Laurent Destailleur
333dd10874
Add a way to lin on bank receipt tab directly
2015-11-08 02:09:32 +01:00
Laurent Destailleur
7a423c04d4
Fix The only default value is value we just entered
2015-11-08 02:00:28 +01:00
Laurent Destailleur
fa8863d2ea
Fix sql migration requests
2015-11-08 01:38:03 +01:00
Laurent Destailleur
e350b759d3
Increase number of last bank receits visible links
2015-11-08 00:52:25 +01:00
Laurent Destailleur
24dff1d842
NEW Statistic graphs on products offer a filter on product type (product
...
/ service or both)
2015-11-08 00:35:30 +01:00
Laurent Destailleur
b5c9602da4
Fix Use new look for left-right arrow
2015-11-08 00:08:50 +01:00
Laurent Destailleur
031b33d582
FIX Checkbox reconciliated no correctly checked with some Chrome
...
versions
2015-11-07 23:54:11 +01:00
Laurent Destailleur
3906cb79c5
NEW: Add parameter to add a link to use "date of invoice" in one click
...
when fille a payment card.
2015-11-07 23:46:07 +01:00
philippe grand
b34edeb751
[Qual] Uniformize code
2015-11-07 21:56:21 +01:00
Florian HENRY
a4fafae109
FIX : Remove column creation for table llx_product_fournisseur_price,
...
the column use un calss is fk_supplier_price_expression, and
fk_price_expression does not exist into lx_product_fournisseur_price sql
file declaration
2015-11-07 17:19:13 +01:00
Laurent Destailleur
4e64230ac9
NEW Add chart of product statistics
2015-11-07 16:25:14 +01:00
Laurent Destailleur
57e162d7f8
The component selectAjaxArray can return javascript part into a global
...
"delayed" variable so caller can output it at end of page. This reduce
the Flash Over Unstyle Content effect.
2015-11-07 15:46:06 +01:00
Marcos García de La Fuente
4a52d3c1b1
Removed unwanted change
2015-11-07 15:35:00 +01:00
Marcos García de La Fuente
84a152dc2e
FIX #3836 Unable to upload a document to an invoice under some circunstances
2015-11-07 15:33:48 +01:00
Marcos García de La Fuente
75b4cb4727
NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2
2015-11-07 14:37:47 +01:00
Marcos García de La Fuente
ba42a7779f
FIX #3877 HTML encoded strings when searching for a supplier invoice
...
Close #3877
2015-11-07 14:34:26 +01:00
Marcos García de La Fuente
0451cc1e73
FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
...
Close #3931
2015-11-07 14:31:12 +01:00
Marcos García de La Fuente
8ccb8c92e0
FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates
...
Close #3897
2015-11-07 14:29:38 +01:00
Marcos García de La Fuente
01854b3259
FIX #3679 Error when deleting a Localtax2 special payment
2015-11-07 13:51:09 +01:00
Marcos García de La Fuente
728f469c1e
FIX #3890 Expected transactions bank account page, shows negative numbers
2015-11-07 13:43:59 +01:00
Marcos García de La Fuente
3bbedf1795
FIX #3707 Thirdparty bank account page table has a glitch
2015-11-07 13:39:34 +01:00
Laurent Destailleur
c0872d690e
Use new banner for other tabs of product
2015-11-07 13:32:14 +01:00
Marcos García de La Fuente
b4c3804c91
FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card
2015-11-07 13:21:03 +01:00
Laurent Destailleur
439e4a483d
Doc comment
2015-11-07 12:37:05 +01:00
Laurent Destailleur
350ef610e9
Fix beluga pdf for projects. Add missing expense reports.
2015-11-07 12:36:34 +01:00
Marcos García de La Fuente
45b4122a95
NEW #3767 Allow changing multiple prices of a product at once
2015-11-07 12:29:51 +01:00
Laurent Destailleur
99f5211070
NEW Can use the * as a joker characters into search boxes of lists
2015-11-07 11:48:35 +01:00
Laurent Destailleur
09fb87e47d
Prepare tables for categories/tags on projects. Looking for a dev to
...
implement categories/tags on projects !
2015-11-07 11:40:31 +01:00
frederic34
7349862b64
translations
2015-11-07 11:19:31 +01:00
frederic34
a597d6c379
allow chaining
2015-11-07 10:23:56 +01:00
frederic34
becce332dd
allow chaining and remove header exit
2015-11-07 09:52:00 +01:00
Laurent Destailleur
e7554d377f
Fix better error message
2015-11-06 19:07:05 +01:00
Laurent Destailleur
b2d9f21253
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-06 18:57:46 +01:00
Laurent Destailleur
d0e6db7f89
Use the new banner for first tab of products.
2015-11-06 18:57:35 +01:00
Gauthier
ef3c7f927e
FIX : wrong coma in llx_opensurvey_sondage.sql creation script
2015-11-06 16:38:26 +01:00
Christophe Battarel
f52ae35dc6
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
...
scratch, reload page after customer selection so its informations can be
loaded
2015-11-06 16:14:00 +01:00
Laurent Destailleur
9cb2d046d0
Merge pull request #3919 from marcosgdf/bug-3914
...
FIX #3194 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared
2015-11-06 12:32:26 +01:00
Laurent Destailleur
fdd93554ce
Merge pull request #3921 from marcosgdf/fr-3898
...
NEW #3898 Remove deprecated Product::hidden property
2015-11-06 12:31:44 +01:00
Laurent Destailleur
b723ca7d16
Merge pull request #3920 from marcosgdf/fr-3768
...
NEW Deprecated Product::setPriceExpression. Use Product::update instead
2015-11-06 12:30:57 +01:00
Laurent Destailleur
2c4b0c0d24
Merge pull request #3918 from FHenry/develop
...
FIX : #3913
2015-11-06 12:20:22 +01:00
Marcos García de La Fuente
ac8bee28ef
NEW #3898 Remove deprecated Product::hidden property
...
Close #3898
2015-11-06 11:40:22 +01:00
Marcos García de La Fuente
9969179267
NEW Deprecated Product::setPriceExpression. Use Product::update instead
2015-11-06 11:35:39 +01:00
Laurent Destailleur
bef4dd2bae
Merge pull request #3917 from atm-maxime/develop
...
Fix : finally, autofocus on product search field is a bad idea...
2015-11-06 11:27:37 +01:00
Marcos García de La Fuente
610ef2359d
FIX #3914 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared
...
Close #3914
2015-11-06 11:26:06 +01:00
Florian HENRY
28b229c83a
FIX : #3916
2015-11-06 11:24:52 +01:00
Laurent Destailleur
11f0cad2ab
FIX #3912
2015-11-06 11:22:50 +01:00
Florian HENRY
d3d62f7db5
FIX : #3913
2015-11-06 11:11:23 +01:00
Maxime Kohlhaas
dac0a7bc50
Fix : finally, autofocus on product search field is a bad idea
2015-11-06 11:09:54 +01:00
Marcos García de La Fuente
f62d6d1950
FIX Product::updatePrice() now sets new prices to Product::multiprices_* arrays
2015-11-06 11:08:41 +01:00
Florian HENRY
b0be2b04c7
FIX : #3912
2015-11-06 10:53:33 +01:00
Florian HENRY
f6b8c3a130
FIX : #3912
2015-11-06 10:50:08 +01:00
Florian HENRY
121d2beb80
fix spacing
2015-11-06 10:34:18 +01:00
Florian HENRY
f220f584ce
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-06 10:31:03 +01:00
Florian HENRY
126b5d6eca
FIX : only active customer should be available into select list
...
thirdparty on invoice creation
2015-11-06 10:19:10 +01:00
Juanjo Menent
f33157033c
Merge pull request #3909 from altatof/fixcloseshipping
...
FIX: change object statut on close shipping and remove erratic db commit
2015-11-06 10:16:00 +01:00
Christophe Battarel
4d11205a01
FIX: change object statut on close shipping and remove erratic db commit
2015-11-06 09:51:33 +01:00
Florian HENRY
600dbced7e
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-11-06 09:49:48 +01:00
Florian HENRY
8d829dca32
FIX : only active customer should be return into new invoice creation
...
select list
2015-11-06 09:49:02 +01:00
philippe grand
5f74a0f1c0
Traduction
2015-11-06 09:46:18 +01:00
philippe grand
67c9db6a51
[Qual] Uniformize code
2015-11-06 09:36:16 +01:00
Juanjo Menent
75c0331b38
Merge pull request #3907 from olsesacl/develop-fix
...
Maintain origin_id and origin for copy document
2015-11-06 09:15:36 +01:00
Sergio Sanchis Climent
6bf8b7f328
Default value origin_id and origin
2015-11-06 02:25:51 +01:00
Laurent Destailleur
f9d0c887ae
NEW Add a refresh button on page list of direct print jobs.
2015-11-06 02:20:42 +01:00
Sergio Sanchis Climent
6b01db5960
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2015-11-06 02:08:55 +01:00
Laurent Destailleur
e78ebf041a
Fix deprecated code not working in jcrop. $.browser.msie and $.browser
...
is no more available in jquery 1.9+.
2015-11-06 02:03:41 +01:00
Laurent Destailleur
0f358eea49
Fix path definition of thumbs with the new function
2015-11-06 01:56:56 +01:00
Sergio Sanchis Climent
de8e7107ee
Maintain origin_id and origin for copy document
...
Fix any errors.
2015-11-06 01:53:20 +01:00
Laurent Destailleur
2dc644da30
Debug Direct print module using the OAuth setup.
2015-11-06 01:33:49 +01:00
Laurent Destailleur
80ec28f9c0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-05 22:20:40 +01:00
Laurent Destailleur
0433f20354
Code comment
2015-11-05 22:20:31 +01:00
Laurent Destailleur
c673b1c0c8
Merge pull request #3905 from GPCsolutions/develop-3893
...
Fix missing category selector
2015-11-05 22:14:38 +01:00
Laurent Destailleur
04664c203d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:13:08 +01:00
Laurent Destailleur
58cac2d895
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/product/stock/fiche.php
htdocs/product/stock/valo.php
2015-11-05 22:04:18 +01:00
Laurent Destailleur
e4bd99aaf3
Merge pull request #3904 from frederic34/printgcp
...
Google Cloud Print
2015-11-05 21:57:08 +01:00
Laurent Destailleur
a7cea65710
Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement
...
NEW add an option to use standard ISO location for bill in crabe model
2015-11-05 21:51:38 +01:00
Laurent Destailleur
5777c16b72
Merge pull request #3902 from altatof/clonedorderdate
...
FIX: change order date on clone (as everywhere else)
2015-11-05 21:49:50 +01:00
Laurent Destailleur
fdf9617e42
Merge pull request #3900 from GPCsolutions/dolibarr-3864
...
Fix #3864 Really fixed invalid jQuery code
2015-11-05 21:47:40 +01:00
Laurent Destailleur
64fb4a30bb
Merge pull request #3899 from grandoc/develop
...
Typo
2015-11-05 21:46:33 +01:00
Laurent Destailleur
6948c65a13
Merge pull request #3895 from marcosgdf/fix-bug-pricerules
...
Fixed feature malfunction caused by a commit and previous changes
2015-11-05 21:46:17 +01:00
Laurent Destailleur
d499fafdb9
Merge pull request #3901 from altatof/3.6
...
FIX bad calculation for stock value
2015-11-05 21:44:21 +01:00
Laurent Destailleur
5860491b14
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2015-11-05 21:33:54 +01:00
Laurent Destailleur
f3b8df3ea5
Merge pull request #3889 from frederic34/escpos
...
Receipt Printer conf and lang
2015-11-05 21:32:43 +01:00
frederic34
55dfa4859f
Install lib with composer
2015-11-05 21:09:14 +01:00
Raphaël Doursenaud
89411541b3
Fix missing category selector
...
Complement to #3893
2015-11-05 18:49:39 +01:00
frederic34
3ef6a92bb1
Google Cloud Print
2015-11-05 18:04:00 +01:00
