Laurent Destailleur
8c84ce1576
Create table llx_stock_serial. This table may be used to store eatby and
...
sellby date for a couple product-batch number in one place only.
2015-10-28 22:05:37 +01:00
philippe grand
d517595f82
[Qual] Uniformize code
2015-10-28 19:28:18 +01:00
Juanjo Menent
0bcb9dde10
Merge pull request #3810 from grandoc/develop
...
[Qual] Uniformize code
2015-10-28 16:11:40 +01:00
Juanjo Menent
a36559c55c
Merge pull request #3809 from aspangaro/develop-hrm
...
HRM module : continue to work
2015-10-28 16:11:17 +01:00
Maxime Kohlhaas
31d5dc6658
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-10-28 15:31:31 +01:00
phf
4180862fec
Merge branch '3.8' into fix_3.8_clone_order
2015-10-28 14:36:31 +01:00
phf
f385f8bcfa
FIX better fix to generate a PROV ref after clone
2015-10-28 14:34:34 +01:00
BENKE Charlie
8cf2aa456b
Missing argument 1 for CommonDocGenerator::__construct()
...
add _construct on htdocs/core/class/commondocgenerator.class.php class need to send $db as parameters
2015-10-28 13:59:05 +01:00
Florian HENRY
9a95401473
FIX : add tag myuser_job into ODT replacement
2015-10-28 11:27:39 +01:00
Laurent Destailleur
1eca2d33c0
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-10-27 22:24:29 +01:00
Laurent Destailleur
87c240252c
FIX Can export a field into task time table with export project profile
2015-10-27 22:24:18 +01:00
Laurent Destailleur
f9c9c58cba
Label must be cheque or transfer
2015-10-27 20:36:27 +01:00
Laurent Destailleur
76ded0acea
Fix using DATE_FORMAT is forbidden
2015-10-27 19:26:33 +01:00
Laurent Destailleur
fb28586f32
Better visible of what is possible for stock management
2015-10-27 19:18:22 +01:00
fappels
8992cfaeb4
move require_once
2015-10-27 15:50:55 +01:00
philippe grand
12e7c7b9e4
[Qual] Uniformize code
2015-10-27 13:42:00 +01:00
Marcos García de La Fuente
eff1f73950
Merge branch 'develop' into multiprice-generator
...
# Conflicts:
# htdocs/install/mysql/migration/3.8.0-3.9.0.sql
# htdocs/product/price.php
2015-10-27 10:41:50 +01:00
Sergio Sanchis Climent
b1bc000bae
standardize
2015-10-27 09:19:39 +01:00
Maxime Kohlhaas
8e04a3d63a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-10-27 09:04:52 +01:00
aspangaro
93d340e497
HRM module : continue to work
2015-10-27 07:26:57 +01:00
aspangaro
b90c56fbb5
HRM : move migration into 3.8 to 3.9
2015-10-27 06:29:18 +01:00
Laurent Destailleur
0a3ba3a0c6
Fix picto
2015-10-26 23:36:05 +01:00
Laurent Destailleur
f4184c9dfe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-10-26 23:33:51 +01:00
Laurent Destailleur
7d8fab73e1
Merge pull request #3792 from grandoc/develop
...
[Qual] Uniformize code
2015-10-26 23:03:30 +01:00
Laurent Destailleur
5bdc4a83b1
Merge pull request #3804 from atm-alexis/3.8_FIX_action_dont_appear_before_an_update
...
FIX action not appear before an update
2015-10-26 22:57:11 +01:00
Laurent Destailleur
24c3491ff7
Code comment
2015-10-26 22:56:54 +01:00
Laurent Destailleur
bd69830cbd
Merge pull request #3803 from atm-robin/3.7_fix_supplier_rights
...
FIX supplier rights for orderToInvoice
2015-10-26 22:46:12 +01:00
Laurent Destailleur
4f04775b41
Merge pull request #3800 from olsesacl/develop
...
error this.price > 0 always false
2015-10-26 22:40:26 +01:00
Laurent Destailleur
0c83d152fc
Merge pull request #3795 from grandoc/patch-1
...
Update index.php
2015-10-26 22:39:32 +01:00
Laurent Destailleur
eb42e0fc4f
Merge pull request #3799 from aspangaro/develop-69
...
Typo
2015-10-26 22:39:14 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
Alexis Algoud
fa3af485ef
FIX action not appear before an update
...
because of a lack of line in action ressource
2015-10-26 18:33:22 +01:00
Laurent Destailleur
6f1d758eae
Fix print feature for md theme
2015-10-26 16:42:31 +01:00
Laurent Destailleur
6493438e87
NEW The clicktodial module is now able to provide link "tel:" on phone
...
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
2015-10-26 16:20:09 +01:00
Laurent Destailleur
07b277b23f
Prepare fields in dtabase to store if time spent was invoiced or not.
2015-10-26 15:22:33 +01:00
atm-robin
29b8919a40
FIX supplier rights for orderToInvoice
2015-10-26 14:34:46 +01:00
Sergio Sanchis Climent
990fbf3ef4
hooks correctly implemented , printObjectLine, printObjectSubLine
...
In hook can change correctly label and ref (for my module need if is posible)
2015-10-26 14:00:43 +01:00
Laurent Destailleur
4b2db78c3a
Keep deprecated options to show or not forms for blind people.
2015-10-26 12:50:32 +01:00
Laurent Destailleur
d5e42478a9
Removed deprecated options to show or not forms. Such forms does not
...
exists anymore.
2015-10-26 12:37:36 +01:00
Laurent Destailleur
5c4ac0bf62
NEW Merge all left menu search boxes into one.
2015-10-26 12:18:22 +01:00
Sergio Sanchis Climent
2696369470
Merge remote-tracking branch 'upstream/develop' into develop
2015-10-26 11:38:52 +01:00
Sergio Sanchis Climent
4fd0086862
Fix: error this.price > 0
...
if no parse this.price when compare this.price and 0 always false
2015-10-26 11:33:43 +01:00
Laurent Destailleur
71da059ef0
NEW Add a new widget $form->selectArrayAjax() to use combo list with
...
content coming from an Ajax URL.
2015-10-26 11:23:31 +01:00
fappels
14470feabd
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-best-pmp-pos-margin
2015-10-26 10:36:40 +01:00
Maxime Kohlhaas
4b7c451f3d
Option of standalone creditnote is hidden
2015-10-26 09:43:58 +01:00
Maxime Kohlhaas
bd831b1f24
Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote
2015-10-26 09:40:50 +01:00
Maxime Kohlhaas
efe282fe39
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_creditnote
2015-10-26 09:40:25 +01:00
aspangaro
f15e672c56
Typo
2015-10-26 05:40:34 +01:00
Laurent Destailleur
132bc610b6
Icon for contact contains a part of thirdparty icon to make things
...
easier to understand
2015-10-25 23:32:49 +01:00
Laurent Destailleur
080ba15e0d
FIX The price per level just never correctly manage the vat. Vat is not
...
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
2015-10-25 22:50:05 +01:00
