Juanjo Menent
e3643c7ab7
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-15 11:44:50 +02:00
Maxime Kohlhaas
af813f8214
Fix missing status_batch var on product lists #9606
2018-10-14 19:55:25 +02:00
Laurent Destailleur
7e68d8df1b
Update product.class.php
2018-10-14 16:47:30 +02:00
Laurent Destailleur
5654492ba8
Update product.class.php
2018-10-14 16:45:45 +02:00
Laurent Destailleur
db2e1e09e7
Merge branch 'develop' into patch-112
2018-10-14 16:44:36 +02:00
Maxime Kohlhaas
d4d921b1cc
Add massaction generate on main lists
2018-10-14 16:27:59 +02:00
Laurent Destailleur
532e05c42e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2018-10-13 14:29:51 +02:00
atm-ph
7b17b453bf
Fix sort and switch page
2018-10-12 23:29:35 +02:00
atm-ph
23e4cd57f3
Fix warnings PHP7
2018-10-12 23:27:38 +02:00
Philippe GRAND
9e494e65e0
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-12 19:04:02 +02:00
Philippe GRAND
357173f0ef
Standardize and update code
2018-10-12 09:30:53 +02:00
Philippe GRAND
849a1a9400
Standardize and update code
2018-10-12 09:26:58 +02:00
atm-ph
79420593f4
Fix display 0 (as virtual stock) instead of empty string
2018-10-11 17:14:22 +02:00
Juanjo Menent
0976616401
Fix: Opening brace should be on a new line
2018-10-11 17:13:39 +02:00
Juanjo Menent
ab55ff2e2c
New: works with variants:
...
- Make the checkbox working correctly
2018-10-11 15:44:23 +02:00
Laurent Destailleur
e6f179b6cb
Fix look
2018-10-11 13:33:44 +02:00
Juanjo Menent
58be4ac7a3
New: works with variants:
...
- Hide child products into list if PRODUIT_ATTRIBUTES_HIDECHILD is activated
2018-10-11 12:36:10 +02:00
Juanjo Menent
2ef0e95586
New: works with variants:
...
- If product is parent showing stock of childs and not itself
- Add function hasVariants for know if product has variants
2018-10-11 12:08:50 +02:00
Fernando Octavio García López
c7eb935cb8
FIX Fixed translatable field name in stock movement table
2018-10-10 22:57:08 -06:00
atm-quentin
aaace60b0d
FIX stock movement on close reception and set status if too much receive$
2018-10-10 15:33:35 +02:00
Laurent Destailleur
df0ec95b22
Code comment and better error message
2018-10-09 21:21:10 +02:00
Philippe GRAND
596dba9ce1
Standardize code
2018-10-06 12:14:47 +02:00
Philippe GRAND
b3925dd2bd
Standardize code
2018-10-05 16:04:10 +02:00
Philippe GRAND
073ec85208
Standardize code
2018-10-05 15:51:08 +02:00
Philippe GRAND
da560289e3
Standardize code
2018-10-05 15:48:38 +02:00
Philippe GRAND
d2ec703b51
Standardize and update code
2018-10-04 09:24:57 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
Laurent Destailleur
75b1cac33f
FIX Pagination stats
2018-10-01 01:15:19 +02:00
Laurent Destailleur
d2e4752427
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-01 01:14:03 +02:00
Laurent Destailleur
d51eb1977a
FIX Pagination stats
2018-10-01 01:10:42 +02:00
Philippe GRAND
574cfad48f
Standardize and update code
2018-09-28 14:49:34 +02:00
Laurent Destailleur
62b31df069
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/rssparser.class.php
htdocs/langs/en_US/boxes.lang
2018-09-27 12:55:25 +02:00
Laurent Destailleur
575c63f87d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2018-09-27 12:52:10 +02:00
Laurent Destailleur
ff3f1e933a
Update replenish.php
2018-09-27 09:22:38 +02:00
gauthier
fc7c0ce521
FIX : need to filter on current entity on replenish
2018-09-24 16:23:44 +02:00
Frédéric FRANCE
6c8cbf710b
reduce complexity of ProductStockEntrepot class
2018-09-16 13:59:15 +02:00
Laurent Destailleur
d6ee00f2e7
Fix constructors does not need return value
2018-09-16 10:22:23 +02:00
Laurent Destailleur
bed8674714
Merge pull request #9519 from frederic34/patch-14
...
reduce complexity of libstatut inventory.class.php
2018-09-16 08:54:22 +02:00
Frédéric FRANCE
d2bd16280e
reduce complexity of libstatut inventory.class.php
2018-09-15 22:20:47 +02:00
Frédéric FRANCE
5d87847b65
reduce complexity of libstatut product.class.php
2018-09-15 22:13:54 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 20:21:35 +02:00
Frédéric FRANCE
a36f41728f
deprecate formbarcode:form_barcode_type
2018-09-10 23:58:57 +02:00
Frédéric FRANCE
312a606345
deprecate formbarcode:select_barcode_type
2018-09-10 23:50:48 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Philippe GRAND
97c740f510
Merge branch 'develop' of github.com:grandoc/dolibarr into develop
2018-09-06 19:28:10 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 21:02:16 +02:00
Laurent Destailleur
2a471df828
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:42:55 +02:00
Laurent Destailleur
ed31eec5ee
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2018-09-05 20:39:38 +02:00
Laurent Destailleur
4ac67e6409
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:31:10 +02:00
Laurent Destailleur
19431a94ba
Code style
2018-09-05 14:37:44 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10
...
Create index.html
2018-09-05 14:15:22 +02:00
Frédéric FRANCE
2015268b7e
Create index.html
2018-09-04 22:06:24 +02:00
Frédéric FRANCE
e4afd4af00
Create index.html
2018-09-04 22:05:06 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop
2018-09-04 16:58:59 +02:00
Philippe GRAND
47b6374abc
Standardize and update code
2018-09-04 13:45:20 +02:00
Philippe GRAND
42565e722e
Standardize and update code
2018-09-04 13:37:00 +02:00
Philippe GRAND
7a0c19485e
fix merge
2018-09-03 09:34:08 +02:00
Laurent Destailleur
bb5fae0e46
Fix eol
2018-09-02 15:30:56 +02:00
Frédéric FRANCE
2a5c994009
move phpcs:ignore
2018-09-02 14:01:37 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore
2018-09-02 13:38:11 +02:00
Frédéric FRANCE
4ea582ad4a
move phpcs:ignore
2018-09-02 11:12:07 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore
2018-09-02 09:57:19 +02:00
Frédéric FRANCE
3e723af018
start changing phpcs:ignore
2018-09-01 23:46:13 +02:00
Philippe GRAND
db32d8903e
Standardize and Update code
2018-09-01 23:20:20 +02:00
Philippe GRAND
7b0d3c32ab
Standardize and Update code
2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
45cbc36a15
Standardize and update code
2018-09-01 15:27:55 +02:00
Philippe GRAND
c013f9cf3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm
...
NEW hook formConfirm always called if hooked
2018-09-01 14:50:08 +02:00
Philippe GRAND
17e349eba2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:27:53 +02:00
Laurent Destailleur
5b6a44434c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-01 14:17:15 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Laurent Destailleur
26cff9e11f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/blockedlog.lang
htdocs/stripe/config.php
2018-09-01 14:13:01 +02:00
Laurent Destailleur
123a66dc2a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/product/class/product.class.php
2018-09-01 14:09:00 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 14:06:23 +02:00
Philippe GRAND
b59d49d3b3
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-01 13:58:33 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Laurent Destailleur
b5ed4de6a6
Merge pull request #9367 from joseplluis/patch-4
...
FIX support of option PRODUCT_DISABLE_VOLUME
2018-09-01 13:37:38 +02:00
Philippe GRAND
d8e6492e93
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing
2018-08-31 21:39:23 +02:00
Philippe GRAND
3a8bde227b
Standardize and update code
2018-08-31 19:26:08 +02:00
Philippe GRAND
bb05e80a87
Standardize and update code
2018-08-31 18:47:25 +02:00
Philippe GRAND
70ae8c6081
Standardize and update code
2018-08-31 18:27:16 +02:00
Philippe GRAND
2f307aae21
Standardize and update code
2018-08-31 18:06:17 +02:00
Josep Lluís
a514b97837
FIX: add global PRODUCT_DISABLE_VOLUME on create
...
On update and view the global PRODUCT_DISABLE_VOLUME is used.
But on create it does not exists.
2018-08-31 10:57:01 +02:00
ksar-ksar
49d3bea192
Remove the test
...
After discussion with Frederic, the best solution is to remove the test
2018-08-30 11:27:48 +02:00
Frédéric FRANCE
5100b8b7b0
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-30 10:42:47 +02:00
atm-greg
f8fef61075
remove useless db begin
2018-08-30 09:19:44 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Laurent Destailleur
6ca9854a34
Fix to avoid fetch when no accounting account defined
2018-08-29 21:07:00 +02:00
Laurent Destailleur
3ebfb23407
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Laurent Destailleur
d40e1a0d0b
FIX #9258
2018-08-29 20:12:38 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Laurent Destailleur
ee204e2e64
Fix regression in php style
2018-08-29 15:37:35 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Laurent Destailleur
9c6ce4b29d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-28 02:36:15 +02:00
Laurent Destailleur
2db84a679e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018
...
Update and standardize code
2018-08-28 02:13:28 +02:00
Laurent Destailleur
534eadb7a2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-28 01:35:43 +02:00
Norbert Penel
f9c1dd8edd
There is a begin transaction without rollback
...
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
2018-08-28 01:32:55 +02:00
Laurent Destailleur
e00d6eda7e
Update productlot_list.php
2018-08-28 01:29:33 +02:00
Frédéric FRANCE
27978ed9a0
Update productlot_list.php
...
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/62492-dolibarr-8-erreur-sql-avec-le-menu-lots-series
2018-08-26 07:47:33 +02:00
ksar-ksar
a844855ade
Update hook formConfirm
...
The hook should be called when the $formconfirm is not empty
2018-08-24 16:40:26 +02:00
Philippe GRAND
87067b2bc9
Standardize and update code
2018-08-23 18:35:45 +02:00
Norbert Penel
92b0668e3e
There is a begin transaction without rollback
...
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
2018-08-23 17:40:40 +02:00
Philippe GRAND
0c75c41e7b
Update and standardize code
2018-08-22 19:56:24 +02:00
Philippe GRAND
6542dcf0bd
Update and standardize code
2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b
Update and standardize code
2018-08-22 11:48:26 +02:00
Philippe GRAND
0ffad50974
Update and standardize code
2018-08-22 11:24:31 +02:00
Philippe GRAND
a36061079b
Update and standardize code
2018-08-22 11:11:59 +02:00
Philippe GRAND
a669830427
Update and standardize code
2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
c76a33fb4f
remove superfluous spaces
2018-08-21 20:12:27 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e
Fix coding style
2018-08-21 19:08:11 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Laurent Destailleur
39f7d4a011
Merge pull request #8975 from atm-greg/Add_hook_on_replenish
...
add hooks on stock replenish
2018-08-21 13:28:18 +02:00
Laurent Destailleur
0ee7befa19
Update replenish.php
2018-08-21 13:27:49 +02:00
Laurent Destailleur
b40e32b8c3
Merge pull request #9264 from grandoc/new_branch_17_08_2018
...
standardize code
2018-08-21 12:52:34 +02:00
Laurent Destailleur
c25a968c72
Update list.php
2018-08-21 12:15:47 +02:00
Laurent Destailleur
a10b4da6ac
Update list.php
2018-08-21 12:13:07 +02:00
Laurent Destailleur
a73d2447d9
Update list.php
2018-08-21 12:10:05 +02:00
ptibogxiv
d5aed3394d
fix duration display for service in list.php
2018-08-20 09:52:59 +02:00
Philippe GRAND
c48211ad70
Update and standardize code
2018-08-17 19:31:22 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing
2018-08-16 00:47:09 +02:00
Laurent Destailleur
3b245f1b30
Merge pull request #9247 from frederic34/missingReturn
...
return comment
2018-08-16 00:35:39 +02:00
Frédéric FRANCE
7bb781eea8
function declaration
2018-08-15 14:28:34 +02:00
Philippe GRAND
57f51fda3e
Standardize
2018-08-15 12:48:13 +02:00
Frédéric FRANCE
5146ab9177
trim
2018-08-14 15:34:44 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
Frédéric FRANCE
3210181a3d
rule for private function is different
2018-08-14 10:21:34 +02:00
Philippe GRAND
e35da2f84d
Standardize code
2018-08-14 09:55:58 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 19:54:03 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description
...
NEW Can record the supplier product description
2018-08-12 18:56:27 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Laurent Destailleur
12e21b4886
FIX update extrafields
2018-08-12 16:29:26 +02:00
Frédéric FRANCE
b00164ca39
test phpcs v3
2018-08-09 11:03:50 +02:00
Frédéric FRANCE
5f4d54ede5
correct space
2018-08-07 17:17:58 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
atm-greg
294045daed
update description without multicurrency
2018-08-07 10:16:04 +02:00
atm-greg
ad5f59822e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:31:41 +02:00
atm-greg
08273612d9
create field without migration
2018-08-06 17:21:20 +02:00
atm-greg
a8b33a1710
New fields desc_supplier on product_fourn_prices
2018-08-06 16:26:25 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include
...
Include and co are statements
2018-08-02 11:03:44 +02:00
Frédéric FRANCE
7dada7ae8e
fix #8820
2018-07-29 09:15:42 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing
2018-07-26 19:05:34 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Philippe GRAND
efa6ad0659
Clean and update code
2018-07-25 19:05:40 +02:00
Philippe GRAND
ff04cb64c0
Clean and update code
2018-07-25 15:36:50 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Laurent Destailleur
d871b8964f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-24 19:23:40 +02:00
Laurent Destailleur
e9eb8da61b
Update replenish.php
2018-07-24 18:09:50 +02:00
Philippe GRAND
74704acbcb
clean and update code
2018-07-18 16:13:13 +02:00
Laurent Destailleur
19bb8a5091
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/accountancy.lang
2018-07-18 14:12:28 +02:00
Laurent Destailleur
33d67ea332
Fix ref on list
2018-07-18 14:09:44 +02:00
gauthier
33aa373362
FIX: when stock is empty for current entity but > 0 in other entity, until this commit product wasn't displaied on replenishment, it must depends on multientity stock sharing
2018-07-16 15:27:37 +02:00
Laurent Destailleur
3eac1f410d
Merge pull request #8983 from atm-greg/Add_hook_on_replenish
...
Add hook on replenish
2018-07-16 10:02:26 +02:00
Laurent Destailleur
20e360e918
Start to introduce array fields for products
2018-07-15 18:22:26 +02:00
Laurent Destailleur
e4be3ab954
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-13 09:09:51 +02:00
Laurent Destailleur
52dee71b39
Responsive
2018-07-12 18:06:06 +02:00
Laurent Destailleur
6eb9f13ec2
Fix warning
2018-07-11 10:01:26 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Laurent Destailleur
d5cb2fc4cd
Update productcustomerprice.class.php
2018-07-09 17:04:50 +02:00
Laurent Destailleur
551e2efe86
Update productcustomerprice.class.php
2018-07-09 17:03:55 +02:00
Regis Houssin
e8afd7e833
Fix: use "supplier" instead "reseller"
2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d
Fix: differentiate customer prices from supplier prices sharing
2018-07-07 08:43:59 +02:00
Philippe GRAND
1e565486d8
fix : typo and update code
2018-07-06 19:17:11 +02:00
Laurent Destailleur
45d1a14c8e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:37 +02:00
Laurent Destailleur
4db7e04523
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/loan/index.php
2018-07-06 16:09:32 +02:00
Laurent Destailleur
2cdd9adc6e
Merge pull request #9023 from atm-maxime/fix_stocklist
...
Fix filters not saved when ordering
2018-07-06 14:23:10 +02:00
Laurent Destailleur
fb84211714
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 12:45:44 +02:00
Laurent Destailleur
b369585e61
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/product/stats/commande.php
htdocs/product/stats/commande_fournisseur.php
htdocs/product/stats/contrat.php
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
htdocs/product/stats/propal.php
htdocs/product/stats/supplier_proposal.php
2018-07-05 15:57:27 +02:00
Laurent Destailleur
0587e73272
FIX Pagination on related item pages
2018-07-05 15:53:28 +02:00
Laurent Destailleur
d8c7c61951
Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into
...
hregis-8.0_canvas
# Conflicts:
# htdocs/product/canvas/product/tpl/list.tpl.php
2018-06-30 18:29:08 +02:00
Laurent Destailleur
982a1ffbaf
NEW Automatic position of scroll when creating an extrafield
2018-06-30 14:22:05 +02:00
Regis Houssin
f3d213bab8
Fix: remove old code
2018-06-30 11:05:13 +02:00
Regis Houssin
debec3d175
Fix: remove old code of canvas
...
Conflicts:
htdocs/product/list.php
2018-06-30 11:03:02 +02:00
Regis Houssin
62a55e10b7
Fix: remove not used list template
2018-06-30 10:58:28 +02:00
Regis Houssin
718cbce8eb
Fix: use "visible" field name instead "checked"
2018-06-30 10:58:08 +02:00
Regis Houssin
96faf7cb0f
Fix: use the new title
2018-06-30 10:55:15 +02:00
Regis Houssin
5b491a4d57
Fix: remove duplicate code
2018-06-30 10:55:01 +02:00
Regis Houssin
ebfd1846a3
Fix: add new field "checked"
2018-06-30 10:54:46 +02:00
Regis Houssin
3a26443546
Fix: remove unused code
...
Conflicts:
htdocs/product/list.php
2018-06-30 10:53:40 +02:00
Regis Houssin
e392610f46
Fix: missing banner
2018-06-30 10:52:51 +02:00
Regis Houssin
f998f64db0
Works on use new list engine instead template for canvas
...
Conflicts:
htdocs/product/list.php
2018-06-30 10:52:26 +02:00
Laurent Destailleur
f9b46ee0fa
Merge pull request #8818 from wdammak/patch-6
...
NEW Add link to inventory code
2018-06-30 01:19:50 +02:00
Laurent Destailleur
a850e91bcb
Merge pull request #9017 from grandoc/new_branch_27_06_2018
...
clean and update code
2018-06-29 19:41:22 +02:00
Maxime Kohlhaas
3babdb9798
Fix filters not saved when ordering
2018-06-28 13:45:30 +02:00
Laurent Destailleur
da138db528
FIX combo into popup become crazy with IE10
...
Conflicts:
htdocs/asset/card.php
htdocs/modulebuilder/template/myobject_card.php
2018-06-28 12:16:12 +02:00
Laurent Destailleur
3ea2d81279
FIX combo into popup become crazy with IE10
2018-06-28 12:05:02 +02:00
Philippe GRAND
a952b46d8b
clean and update code
2018-06-27 12:37:31 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
36402c22ee
FIX SQL Injections reported by mu shcor (ADLab of Venustech)
2018-06-25 14:06:09 +02:00
Laurent Destailleur
e9b4141dd9
Fix syntax error
2018-06-23 17:11:19 +02:00
Laurent Destailleur
2db2ea3627
Fix colspan
2018-06-23 15:13:39 +02:00
Laurent Destailleur
dbb90e80a3
Fix syntax error
2018-06-23 12:57:41 +02:00
Laurent Destailleur
eb88f1e5c9
Fix look and feel v8
2018-06-23 12:41:03 +02:00
Laurent Destailleur
be2309c70f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-22 22:54:11 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Laurent Destailleur
02fbe4a84c
Merge pull request #8991 from hregis/develop_product
...
Fix: avoid Warning: A non-numeric value encountered
2018-06-22 15:52:05 +02:00
Laurent Destailleur
6f1101a2d6
Update card.php
2018-06-22 15:51:26 +02:00
Laurent Destailleur
1bf0432a72
Merge pull request #8997 from ptibogxiv/patch-29
...
add minute to duration services
2018-06-22 15:12:57 +02:00
Laurent Destailleur
0f80508be1
Fix canvas on list is a feature going in the wall so i clean this.
2018-06-22 14:51:47 +02:00
ptibogxiv
a6151ee11e
add minute to duration services
...
add minute for duration description (more compliant thant 0,166667h for billing services by minute
2018-06-20 12:10:25 +02:00
Regis Houssin
b9fe6f8624
Fix: avoid warning
2018-06-19 19:00:23 +02:00
Regis Houssin
2c927dba01
Fix: wrong var name "shownav"
2018-06-19 18:33:22 +02:00
Regis Houssin
b9893bde1d
Fix: avoid Warning: A non-numeric value encountered
2018-06-19 18:26:37 +02:00
atm-greg
df056980b5
fix bad result on fetch ProductStockEntrepot
2018-06-19 10:46:07 +02:00
Laurent Destailleur
edd7499375
Fix clone with new architecture
2018-06-19 09:21:23 +02:00
Laurent Destailleur
5b019eb985
Merge pull request #8982 from hregis/7.0_bug6
...
Fix: "libelle" is deprecated, use "label" instead
2018-06-18 14:32:35 +02:00
Regis Houssin
54a333c374
Fix: use label instead libelle
2018-06-18 13:54:14 +02:00
Regis Houssin
494d6dcfef
Fix: libelle is deprecated, use label instead
2018-06-18 13:50:58 +02:00
atm-greg
2cdae2ec98
remove globalcard context
2018-06-18 11:30:38 +02:00
Laurent Destailleur
7981bd08b7
Fix price+sql error when adding product when no supplier price defined
2018-06-16 14:47:33 +02:00
atm-greg
72449ddef4
add hooks on stock replenish
2018-06-15 16:55:23 +02:00
Laurent Destailleur
910652eb6d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
fappels
a86c90fed1
Fix Wrong error for duplicate ref if barcode enabled but not set.
2018-06-12 16:38:42 +02:00
fappels
141d19571c
Add modify trigger to barcode modify.
2018-06-06 17:11:34 +02:00
Laurent Destailleur
eaee252a5d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-04 12:56:12 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
fappels
e0f9605483
Fix add missing properties for trigger
2018-06-03 11:05:02 +02:00
Laurent Destailleur
be2c49d490
Fix log
2018-06-01 17:39:07 +02:00
Laurent Destailleur
0503373e31
Avoid error on screen
2018-05-31 09:49:46 +02:00
Laurent Destailleur
51b5f63ce8
Merge pull request #8880 from wdammak/patch-14
...
Add movement generateDocument function (mode dev)
2018-05-29 11:15:00 +02:00
Laurent Destailleur
cf5f7bf06d
Update price.php
2018-05-29 10:52:55 +02:00
Laurent Destailleur
f473607249
Merge branch 'develop' into patch-15
2018-05-29 10:49:28 +02:00
wdammak
9ec6387a63
Add movement generateDocument function (mode dev)
2018-05-28 05:21:53 +01:00
Frédéric FRANCE
022d457284
loadlangs
2018-05-27 00:06:49 +02:00
Frédéric FRANCE
d986909109
loadlangs
2018-05-26 23:52:52 +02:00
Frédéric FRANCE
58e5715ac3
loadlangs
2018-05-26 17:57:30 +02:00
Frédéric FRANCE
a487cf6806
Update price.php
2018-05-26 15:15:38 +02:00
jean
fb96857b73
use dayhour instead of % format
2018-05-25 15:33:27 +02:00
jean
eb39e5746e
Merge remote-tracking branch 'origin/develop' into dev_datepricefour
2018-05-25 15:32:15 +02:00
Laurent Destailleur
823936ef87
Merge pull request #8847 from frederic34/multipriceqty
...
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-25 12:55:02 +02:00
Laurent Destailleur
9d407cdc03
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-25 11:27:04 +02:00
Laurent Destailleur
0e6aa3def3
Fix duplicate deprecated file
2018-05-25 11:26:50 +02:00
Laurent Destailleur
cbe54e596b
Merge pull request #8817 from wdammak/patch-5
...
Add generateDocument function to entrepot class
2018-05-25 11:08:43 +02:00
Laurent Destailleur
f416f9629e
Merge pull request #8840 from all3kcis/patch-9
...
Add oldcopy on productlot::update()
2018-05-25 10:22:18 +02:00
Laurent Destailleur
b9fbf13eba
Fix look and feel v8
2018-05-25 09:36:49 +02:00
Laurent Destailleur
23e2bb20d9
Look and feel v8
2018-05-24 12:32:04 +02:00
Laurent Destailleur
e51aa68284
Fix link to warehouses for events
2018-05-24 12:16:04 +02:00
Frédéric FRANCE
0623ff7667
fix logic
2018-05-24 11:56:19 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty
2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-23 17:05:08 +02:00
All3kcis
4bfd8b5539
Add oldcopy on productlot::update()
2018-05-23 10:38:24 +02:00
jean
1ab5eece6b
Adding code to show update date of supplier price shown
2018-05-22 09:40:49 +02:00
Laurent Destailleur
de84f0e687
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/actions_massactions.inc.php
htdocs/filefunc.inc.php
2018-05-21 23:35:09 +02:00
wdammak
90881fe488
Add link to inventory code
2018-05-18 16:32:46 +01:00
wdammak
5fef8c2dc1
Add generateDocument function to entrepot class
2018-05-18 14:59:42 +01:00
Laurent Destailleur
429efcc979
Merge pull request #8772 from wdammak/patch-2
...
Documents generes movement warehouse
2018-05-18 12:20:58 +02:00
Laurent Destailleur
b5f37b2876
Merge pull request #8811 from fappels/7.0_fix_product_vat_update_errorhandling
...
Fix product vat update error handling
2018-05-18 12:00:03 +02:00
fappels
90d2ccc79c
Fix product vat update error handling
...
Product vat update does not show update error if update result negative.
2018-05-17 21:29:15 +02:00
wdammak
c0e5132108
Documents generes movement warehouse
2018-05-09 15:07:11 +01:00
wdammak
e62426546d
Add Documents generes
2018-05-09 15:02:46 +01:00
BENKE Charlene
8ed3b3e49c
Update product.class.php
2018-05-06 22:12:43 +02:00
BENKE Charlene
70c9ed960d
let's play with hook
2018-05-06 22:11:24 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
44cb60e61d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-05 13:25:00 +02:00
Laurent Destailleur
f6ca1eb624
Fix permission name
2018-05-05 13:24:46 +02:00
Laurent Destailleur
634e58b7c9
Look and feel v8
2018-05-04 18:24:00 +02:00
fappels
db76fd7895
Fix delete all product variants of a parent product
...
User object missing
2018-05-02 22:33:23 +02:00
BENKE Charlene
5ac0f77d0e
Add trigger for virtual stock
...
Allow to add/sustract some qty for GPAO OF running
2018-05-02 17:29:31 +02:00
Laurent Destailleur
0cdfd6800a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-29 20:11:47 +02:00
Laurent Destailleur
aafab12f4b
Debug API for ticket module
2018-04-29 18:06:31 +02:00
Laurent Destailleur
19d15c79dd
Merge pull request #8673 from frederic34/variantonservice
...
NEW Module variant supported on services
2018-04-27 10:01:28 +02:00
Laurent Destailleur
90723357c4
Look and feel v8
2018-04-24 13:50:05 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Frédéric FRANCE
5f4e2dc565
variant on services
2018-04-24 11:01:17 +02:00
Frédéric FRANCE
657fa48c3f
Update api_products.class.php
2018-04-23 15:31:55 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
...
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18
Remove useless $var
2018-04-22 18:51:03 +02:00
Laurent Destailleur
411949a6bb
Optimize constructors
2018-04-21 15:08:46 +02:00
Laurent Destailleur
394b988a4e
FIX key in getEntity for supplier proposals
2018-04-21 14:41:31 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Laurent Destailleur
c30b0da07d
Clean code
2018-04-21 12:12:46 +02:00
Laurent Destailleur
cef9782179
Clean defined constant at begin of pages
2018-04-21 12:00:55 +02:00
Ferran Marcet
6ced1a3264
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-20 10:38:16 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
2959dc4a3a
Fix regression
2018-04-15 18:20:04 +02:00
Laurent Destailleur
e2838aa074
NEW Show also size in bytes in tooltip if visible unit is not bytes
2018-04-15 17:58:13 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
fbae4429b7
Clean code for better extrafields management
2018-04-13 12:52:23 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16
...
NEW Add files management on products lot
2018-04-13 00:57:13 +02:00
Laurent Destailleur
341d1efb11
Fix clear filter must not lose type
2018-04-12 23:42:06 +02:00
Laurent Destailleur
3cecfd02c7
NEW Mutualize code for action="update_extras"
...
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
2018-04-12 23:16:23 +02:00
All-3kcis
c35b454455
Fix bug productlot created without entity
2018-04-12 17:13:42 +02:00
All-3kcis
f1d1fdf951
Fix bug when entity=null on DB
2018-04-12 17:11:02 +02:00
All-3kcis
21df700325
Add option to save file with product batch ref
...
+ use batch number like ref instead of id
+ debug access to shared link
2018-04-12 15:55:08 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +02:00
All-3kcis
f7e58f3c73
Add files management on products lot
2018-04-12 15:10:37 +02:00
Laurent Destailleur
68b4b74d80
Merge pull request #8531 from all3kcis/patch-7
...
Add insertExtraFields into create/update
2018-04-11 16:34:21 +02:00
Laurent Destailleur
701aa53bdd
Update productlot.class.php
2018-04-11 16:33:12 +02:00
All3kcis
00c8593567
remove hook
2018-04-11 14:09:30 +02:00
Laurent Destailleur
7d7c0624d2
Update traduction.php
2018-04-11 12:59:24 +02:00
Laurent Destailleur
eeb2580f32
Fix foreign key error
2018-04-10 22:23:21 +02:00
atm-quentin
809b2a91ed
FIX issue #8037
2018-04-10 16:27:18 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
All3kcis
3cc3816391
Add $action before insertExtrafields hook
2018-04-10 10:17:06 +02:00
All3kcis
691e3df1c0
Add insertExtraFields in create
2018-04-10 09:59:07 +02:00
Laurent Destailleur
ff411ed2e5
NEW Add accounting account number on product tooltip
2018-04-08 23:54:04 +02:00
Laurent Destailleur
58bc3e5e74
FIX Ref of supplier invoice in stats page
2018-04-08 23:38:54 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
723ac6fba0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-06 00:02:06 +02:00
Laurent Destailleur
6c409b2670
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-05 18:08:19 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
Laurent Destailleur
55719cd166
Update card.php
2018-04-05 16:20:50 +02:00
Laurent Destailleur
7c70f9ed03
Fix option STOCK_SUPPORTS_SERVICES
2018-04-03 20:23:47 +02:00
Maxime Kohlhaas
0c3b92f09a
Better fix
2018-04-03 14:53:57 +02:00
Maxime Kohlhaas
39eab6d88d
Fix service creation, right is tested regarding the product type
2018-04-03 14:38:20 +02:00
Regis Houssin
9f7fcdc8bf
Fix: multiple avoid Warning and errors
2018-04-02 10:18:51 +02:00
Laurent Destailleur
a9ac7e1f29
Debug inventory module
2018-03-31 19:20:38 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Laurent Destailleur
f5079276fb
Fix use new extrafield array definition.
...
Fix exclude separator from list of fields in lists
2018-03-31 17:52:31 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Marc de Lima Lucio
3646374976
NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders
2018-03-28 11:54:21 +02:00
Laurent Destailleur
72cedcf9f3
Removed method fetch_prods() and get_each_prod() not used, keep only
...
get_arbo_each_prod() that is better.
2018-03-22 18:01:06 +01:00
Laurent Destailleur
9980a5fbd0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2018-03-22 14:08:43 +01:00
Laurent Destailleur
700c69e127
NEW Can set position of images in module tickets
...
Mutualize code of method show_photo
2018-03-22 11:46:35 +01:00
fappels
3765bc4775
Fix html escape for edit label
2018-03-22 10:48:03 +01:00
fappels
9e4a66b1a9
Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION
2018-03-22 10:46:54 +01:00
All3kcis
a7e33150ce
add status batch for getNomUrl
2018-03-16 14:09:38 +01:00
All3kcis
c574a74a2e
Add status batch for getNomUrl
2018-03-16 13:59:04 +01:00
All3kcis
1c0fdcda7a
Add status batch for getNomUrl
2018-03-16 13:57:02 +01:00
All3kcis
fd275a636c
Add batch status
...
Add batch status, for correct display with getNomUrl
2018-03-16 11:45:46 +01:00
Laurent Destailleur
c962b89495
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
2018-03-15 20:46:55 +01:00
Laurent Destailleur
302fed8646
More fa image to replace png picto
2018-03-14 20:08:44 +01:00
Laurent Destailleur
78b0585798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
55d3e72463
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/societe/card.php
2018-03-12 19:02:30 +01:00
Laurent Destailleur
d5d6939fd9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-03-11 19:28:39 +01:00
Laurent Destailleur
43e297b142
Merge pull request #8138 from frederic34/patch-2
...
Update price.php
2018-03-11 18:33:16 +01:00
Laurent Destailleur
64f21b8a3c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2018-03-11 00:10:13 +01:00
Laurent Destailleur
6c9e0e1752
Merge branch '7.0' into 7.0
2018-03-10 21:52:57 +01:00
Laurent Destailleur
905cf112e9
Merge pull request #8327 from tiaris/fix7.0
...
FIX #8289
2018-03-10 18:58:22 +01:00
Laurent Destailleur
6fcc271790
Update product.class.php
2018-03-10 18:57:55 +01:00
Laurent Destailleur
aea3c164ba
Merge pull request #8178 from hregis/7.0_bug2
...
Fix: avoid Warning: A non-numeric value encountered
2018-03-10 18:47:11 +01:00
BadPixxel
44d18027f2
BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709
2018-03-10 15:48:40 +01:00
jean
6793bfae3a
FIX #8289 add a cofoiguration for correct stopck calculation
2018-03-10 14:17:52 +01:00
Laurent Destailleur
212536a3fd
Update list.php
2018-03-10 12:54:20 +01:00
Laurent Destailleur
64f2f324de
Update card.php
2018-03-10 12:52:09 +01:00
Laurent Destailleur
a7f82af352
Update card.php
2018-03-10 12:49:25 +01:00
Maxime Kohlhaas
fd36ade61a
Fix unit in replenish #7225
2018-03-10 11:20:32 +01:00
florian HENRY
1c966d4769
on going
2018-03-09 12:57:58 +01:00
Laurent Destailleur
62a339e582
Minor fix in multicurrency for supplier prices
2018-03-07 14:13:46 +01:00
Laurent Destailleur
cf45f78d7e
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency
...
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-03-07 13:12:23 +01:00
Laurent Destailleur
14d7ffa53b
Fix cancel and template to record stock movement/correction
2018-03-06 09:07:39 +01:00
Laurent Destailleur
d569adea2f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-05 21:46:40 +01:00
Laurent Destailleur
1537363e59
Fix cancel and template to record stock movement/correction
2018-03-05 21:16:01 +01:00
Laurent Destailleur
c921fde3e5
Update mouvement.php
2018-03-05 20:58:30 +01:00
Alexis ALGOUD
35002cf93d
Merge branch 'develop' into NEW_price_on_stock_mvt
2018-03-05 17:45:27 +01:00
Alexis Algoud
a84990ab78
NEW price in burger menu on mouvement list
2018-03-05 17:43:06 +01:00
Laurent Destailleur
ea5cd4db76
Merge pull request #8250 from ruistrecht-alt/Fix_bad_naming_resotre
...
FIX misspelled restore_lastsearch_values
2018-03-02 17:53:33 +01:00
Laurent Destailleur
a3350d12d8
css
2018-03-01 23:51:06 +01:00
Laurent Destailleur
0e7a250060
Fix colspan
2018-03-01 11:53:18 +01:00
Laurent Destailleur
3c903675f2
Fix colspan
2018-02-28 15:29:52 +01:00
Laurent Destailleur
5ef7bee030
Use combo for selection of categories into virtual product edition
2018-02-28 15:27:21 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Laurent Destailleur
6bec121c9f
Use name of var
2018-02-27 13:26:57 +01:00
Rui Strecht
5b925a5912
Fix misspelled restore_lastsearch_values
2018-02-27 11:08:23 +00:00
Laurent Destailleur
0cc84ab92f
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15
FIX Missing restore_lastsearch_values
2018-02-26 21:16:40 +01:00
Laurent Destailleur
19ae24f693
Code comment
2018-02-26 21:03:52 +01:00
kkhelifa-opendsi
90f4c985f6
Merge branch 'develop' into product_supplier_buyprice_multicurrency
2018-02-26 09:54:09 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
2cd5ed65a6
Clean deprecated (field unit_charge in supplier price)
2018-02-25 14:13:09 +01:00
Regis Houssin
b216249214
Fix: missing hook parameters
2018-02-24 15:01:29 +01:00
Laurent Destailleur
0a79550f43
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
KHELIFA
54dba24ab5
Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-02-23 11:06:07 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00
FIX Trigger *_MODIFY must be called when editing a property event extra.
...
Clean duplicate trigggers "*_CLONE"
2018-02-20 18:09:38 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
Laurent Destailleur
f1a9f81fb4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-14 22:19:59 +01:00
Laurent Destailleur
7f8cbc0f62
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/contrat/services.php
htdocs/contrat/tpl/linkedobjectblock.tpl.php
htdocs/install/upgrade2.php
2018-02-14 22:08:18 +01:00
Laurent Destailleur
23ee6748f7
Update fournisseurs.php
2018-02-14 20:36:13 +01:00
Laurent Destailleur
4f369bd746
NEW Can force usage of shared link for photo of products
2018-02-13 16:34:43 +01:00
Laurent Destailleur
36ac380cac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 22:26:48 +01:00
Laurent Destailleur
00a8be22a2
Fix field too small
2018-02-12 22:11:43 +01:00
Regis Houssin
24cc687724
Fix: you can't check "fournisseur" with checkUserAccessToObject without
...
object ID
2018-02-12 09:28:41 +01:00
Regis Houssin
40fe3849dc
Fix: avoid Warning: A non-numeric value encountered
2018-02-12 08:21:35 +01:00
Laurent Destailleur
6bdb82cf27
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/class/api_thirdparties.class.php
2018-02-12 04:15:47 +01:00
Laurent Destailleur
7f4adb7f97
Update card.php
2018-02-12 03:23:57 +01:00
Regis Houssin
3525306cc4
Fix: wrong var name
2018-02-11 13:29:37 +01:00
Regis Houssin
86df1ddd0a
Fix: uniformize user rights check
2018-02-11 13:27:02 +01:00
Regis Houssin
01b3b8e09e
Fix: check perms by type of product
2018-02-11 12:09:12 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
03b10041db
Fix missing contextpage
2018-02-08 13:27:43 +01:00
Frédéric FRANCE
9f7496ce04
Update price.php
2018-02-05 17:47:29 +01:00
Laurent Destailleur
fe57cf697f
Fix init category selected
2018-02-04 14:35:38 +01:00
Laurent Destailleur
ec15048964
Fix init category selected
2018-02-04 14:34:31 +01:00
Laurent Destailleur
fae7616281
Fix update price when updating products
2018-02-01 21:20:54 +01:00
Laurent Destailleur
e79f6fda2b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-01-26 01:23:18 +01:00
Laurent Destailleur
2c0eeaf8de
FIX #8093
2018-01-25 20:57:51 +01:00
Laurent Destailleur
39c4df723a
Fix error management when setting product accounts
2018-01-22 21:07:10 +01:00
Laurent Destailleur
23494a9dd4
Update product.php
2018-01-20 12:53:30 +01:00
All-3kcis
a58a3f893d
Fix #8058
2018-01-19 10:21:48 +01:00
Laurent Destailleur
3c3402bc60
Debug API for prices of products
2018-01-14 15:58:04 +01:00
Laurent Destailleur
8b972313ae
Fix scrutinizer
2018-01-12 15:38:53 +01:00
Laurent Destailleur
f0a10cdcc1
Missing backlink
2018-01-12 10:32:48 +01:00
Laurent Destailleur
af6b84ba3a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
2018-01-11 01:03:13 +01:00
Laurent Destailleur
9827358002
Merge pull request #8040 from atm-florian/dev_fixsecu
...
fix #7963
2018-01-11 00:44:45 +01:00
Laurent Destailleur
4747e84b74
Update price.php
2018-01-11 00:40:33 +01:00
Laurent Destailleur
b5fe953a64
Merge pull request #8035 from pdermody/6.0
...
Fix #8034 - Surface and volume units are calculated incorrectly
2018-01-11 00:36:00 +01:00
HENRY Florian
5af39e80e0
Update price.php
2018-01-10 20:38:06 +01:00
Laurent Destailleur
43d560830c
Fix on old php
2018-01-10 13:20:43 +01:00
florian HENRY
fdedd6f75b
fix 7963
2018-01-08 20:54:40 +01:00
Paul Dermody
a1ac285a25
Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet.
2018-01-07 12:42:14 -06:00
Laurent Destailleur
301f509611
Merge pull request #8019 from atm-gauthier/6.0_fix_vat_mass_update
...
FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false
2018-01-04 21:03:20 +01:00
Laurent Destailleur
e4d37c3e23
Merge pull request #8012 from ATM-Nicolas/fix_product_best_price
...
Fix product best price
2018-01-04 20:58:59 +01:00
gauthier
58470e0913
FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false
2018-01-04 12:01:21 +01:00
Laurent Destailleur
c7798d11ce
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-01-03 20:13:17 +01:00
ATM-Nicolas
2e6c036ad8
Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_product_best_price
2018-01-02 17:22:53 +01:00
ATM-Nicolas
61efda4cbd
FIX : product best price on product list
2018-01-02 17:21:04 +01:00
Laurent Destailleur
644e8b5a05
Fix navigation on stock
2017-12-24 15:02:15 +01:00
Laurent Destailleur
e6c7f9e69b
Debug module inventory
2017-12-22 21:29:09 +01:00
Laurent Destailleur
f0c8b548f3
Fix bugs reported by scrutinizer
2017-12-22 14:24:31 +01:00
Laurent Destailleur
493669e986
Fix look and feel v7
2017-12-22 14:19:12 +01:00
Laurent Destailleur
2b056b0177
BUG Fix of old hidden feature price per quantity
2017-12-22 12:53:46 +01:00
Laurent Destailleur
27a9a81f99
Fix link to contracts
2017-12-21 23:48:33 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Frédéric FRANCE
ab558ee5fa
Update product.php
2017-12-14 09:49:55 +01:00
Laurent Destailleur
247c380d18
Several fixes
2017-12-12 16:11:40 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
f85e79e250
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/filefunc.inc.php
htdocs/holiday/class/holiday.class.php
2017-12-08 13:13:53 +01:00
Laurent Destailleur
8dc3d7323d
Merge pull request #7923 from fmarcet/6.0
...
FIX #7379 : Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
2017-12-08 13:02:07 +01:00
Laurent Destailleur
9b9b5adf66
Fix must be compatible with old and new storage location
2017-12-08 13:01:45 +01:00
Laurent Destailleur
08abb1490a
Remove code using not defined var
2017-12-08 12:54:08 +01:00
Ferran Marcet
bfc476a118
FIX #7379 : Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
2017-12-07 18:44:33 +01:00
Ion
669e080670
More informative error message in dynamics price
2017-12-06 14:51:29 +01:00
Laurent Destailleur
2458244ee3
Fix css
2017-12-02 16:24:38 +01:00
Laurent Destailleur
0a6633da6e
Fix error message
2017-12-02 15:56:56 +01:00
Laurent Destailleur
fa8b913d24
Change order or field
2017-12-02 11:24:33 +01:00
Laurent Destailleur
e8327fd9a1
Fix the eatby/sellby date was not visible.
2017-12-02 10:43:01 +01:00
Laurent Destailleur
64d29709d5
FIX #7881 error not reported/blocking when subprodut need lot
2017-12-01 18:12:29 +01:00
Laurent Destailleur
4969ae2abb
Fix missing the badge on virtual product tab
2017-12-01 17:48:51 +01:00
Laurent Destailleur
a832bbb348
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture/stats/index.php
2017-12-01 16:18:03 +01:00
Laurent Destailleur
471f99c24c
Fix look and feel v7
2017-12-01 15:58:35 +01:00
Laurent Destailleur
46b015d205
Fix usage of option STOCK_SUPPORTS_SERVICES
2017-12-01 13:40:24 +01:00
Laurent Destailleur
a0231b5c60
Fix responsive
2017-12-01 12:55:28 +01:00
root
b7f26ea788
FIX add line bad price and ref
2017-11-30 11:10:01 +01:00
Laurent Destailleur
c1e6d35ca5
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search
...
factorization of extrafields into list
2017-11-28 12:14:47 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Scrutinizer Auto-Fixer
aab2799981
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-11-27 13:48:36 +00:00
Laurent Destailleur
ffe2be377c
Fix navigation
2017-11-26 20:43:37 +01:00
Laurent Destailleur
a0406bc741
Standardize view of events for products
2017-11-26 20:24:20 +01:00
Laurent Destailleur
ae906270f3
Debug module variant
2017-11-26 18:43:43 +01:00
Laurent Destailleur
77509ee37a
Removed deprecated apis
2017-11-25 13:14:28 +01:00
Laurent Destailleur
aaf08ade2f
Fix bug reported by scrutinizer
2017-11-25 11:21:31 +01:00
Laurent Destailleur
831099fef8
Debug modulebuilder
2017-11-24 16:24:42 +01:00
Laurent Destailleur
5ee85821fc
Debug modulebuilder
2017-11-24 15:47:38 +01:00
Laurent Destailleur
9f235e1ff6
Standardize database: field ref of warehouse was renamed label -> ref
2017-11-24 15:27:00 +01:00
Laurent Destailleur
9c22b5f335
Replace deprecated dol_print_graph with DolGraph
2017-11-23 20:24:05 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
405275693f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/replenishorders.php
htdocs/projet/activity/perday.php
2017-11-17 14:20:08 +01:00
Laurent Destailleur
a6e4e4ddb0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/product/stock/replenishorders.php
2017-11-17 14:17:49 +01:00
Laurent Destailleur
fde33594a2
FIX #7824
2017-11-17 14:06:08 +01:00
Laurent Destailleur
7f28c9fff6
FIX #7824
...
Conflicts:
htdocs/product/stock/replenishorders.php
2017-11-17 14:01:21 +01:00
Laurent Destailleur
57a6ada2a3
FIX #7824
2017-11-17 13:57:40 +01:00
Laurent Destailleur
25a2e6f577
FIX #7824
2017-11-17 13:56:41 +01:00
Laurent Destailleur
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +01:00
Laurent Destailleur
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
florian HENRY
e195cf0b95
fix : return vat code for supplier price
2017-11-14 09:53:06 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +01:00
Laurent Destailleur
955ed7dbbf
NEW Show the supplier ref into supplier cards
2017-11-12 15:30:21 +01:00
Laurent Destailleur
186c8cdbf0
Fix selection of contact into creation of event
2017-11-12 13:40:05 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
7e1e710d28
Merge pull request #7796 from IonAgorria/fix-price-dynamic
...
Fix: price dynamic bugs
2017-11-11 17:49:00 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Ion
cb463d186a
Error when fetching empty expression
2017-11-10 12:32:54 +01:00
Ion
fdf260a1da
Use __METHOD__ on dynamic prices syslog
2017-11-10 12:32:54 +01:00
Ion
f642289160
Add missing arg in supplier min price
2017-11-10 12:32:49 +01:00
Ion Agorria
aa0b811f73
Undefined variable detection in price parser
2017-11-09 17:12:55 +01:00
Ion
e528a82051
Remove price dynamic internal var
2017-11-09 17:12:55 +01:00
Laurent Destailleur
e7abc92f97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/transfer.php
htdocs/core/lib/functions.lib.php
2017-11-06 21:37:19 +01:00
Laurent Destailleur
6eb2204c2b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/product/list.php
2017-11-06 21:20:06 +01:00
Laurent Destailleur
34bd785785
Prepre 7.0 (not stable code hidden)
2017-11-06 09:30:30 +01:00
Laurent Destailleur
fa999dfa65
Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant
...
NEW Accountancy Add variant on sell account for intracommunity sales & export sales
2017-11-06 09:25:14 +01:00
Laurent Destailleur
141bef0b8a
Fix translation and css
2017-11-04 15:21:35 +01:00
Maxime Kohlhaas
e992e4bea5
Fix : type was forced to 0 so service are not in the list
2017-11-03 09:09:07 +01:00
Maxime Kohlhaas
13667e4850
Fix display of product/service list
2017-11-03 08:56:23 +01:00
Alexandre SPANGARO
2d17e4094c
Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
...
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-03 06:18:27 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Alexandre SPANGARO
8d3beef161
Add fields in product card
2017-11-01 07:19:36 +01:00
fappels
3f5112ff48
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update
2017-10-31 16:49:54 +01:00
fappels
f7df9e1d1f
Fix travis
2017-10-31 16:49:39 +01:00
fappels
a9ceb46f97
Add parameter to load all lot from lines of object in cache
...
If you want use the lot stock selector in mutiple lines you can add
lines array. If you don't give a product id or a lines array, no lot
numbers will be loaded.
2017-10-29 20:40:56 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
8058712d47
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
2017-10-26 17:02:40 +02:00
Laurent Destailleur
6163a3d54d
Code comment
2017-10-26 16:57:17 +02:00
Laurent Destailleur
0efd118d43
Fix hook on product list
2017-10-26 16:50:38 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
9f0f5eb5e8
Fix translation of extrafields type
2017-10-24 18:05:43 +02:00
Laurent Destailleur
d2f723045c
Work on website and modulebuilder
2017-10-24 17:30:05 +02:00
fappels
7f7e621ea9
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update
2017-10-24 10:53:34 +02:00
fappels
fe2acb2cb6
Add form select for lot numbers
2017-10-23 22:17:24 +02:00
Laurent Destailleur
285203ed0e
Reduce diplicate code
2017-10-22 17:00:35 +02:00
Laurent Destailleur
36ad17cc95
Work on module builder
2017-10-22 16:45:18 +02:00
Laurent Destailleur
c6e5115d34
Set default limit to 100 on all rest api that list
2017-10-22 15:42:19 +02:00
Laurent Destailleur
4a1834ee29
#7411
2017-10-22 04:23:17 +02:00
Laurent Destailleur
c9fceaad3c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/index.php
htdocs/fourn/facture/card.php
2017-10-22 04:04:26 +02:00
Laurent Destailleur
030cea6a0f
Merge pull request #7664 from frederic34/patch-1
...
keep vat input with multiprices product creation
2017-10-22 02:42:44 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
abd5251330
Better responsive
2017-10-19 19:53:29 +02:00
Frédéric FRANCE
5afd2695fb
keep vat input with multiprices product creation
2017-10-19 18:33:15 +02:00
florian HENRY
b0c68ddc61
fix displaying accountancy code
2017-10-19 12:35:59 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Laurent Destailleur
347883b7be
Code comment
2017-10-18 10:39:36 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
33624e1001
NEW Attaching doc automatically in email is now a parameter of template.
2017-10-08 16:34:42 +02:00
Laurent Destailleur
df2f73bdc3
Fix quick search on product/services
2017-10-07 20:36:32 +02:00
Laurent Destailleur
e40bffb0d5
Fix bug reported by scrutinizer
2017-10-07 20:21:47 +02:00
Laurent Destailleur
8e0da9bfeb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
Regis Houssin
45de1ca21e
Fix: check security
2017-10-03 19:09:46 +02:00
Regis Houssin
4537e5472b
Fix: refactorization of "getListForItem" function
2017-10-03 19:01:54 +02:00
Regis Houssin
ed5dca652d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi
2017-10-03 17:32:40 +02:00
Laurent Destailleur
a501a20487
NEW Search filters in lists are restored when using "back to list"
2017-10-03 16:00:52 +02:00
Regis Houssin
f8f4ff6d21
Fix: missing include api_categories class
2017-10-03 13:07:07 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
arnaud
8866683a72
Merge branch '6.0' of github.com:Dolibarr/dolibarr into FIX_replenish_stock_line_0
2017-09-27 10:55:49 +02:00
arnaud
7f807986d7
FIX replenish if line test GETPOST on line 0
2017-09-27 10:53:29 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
d7dd6ed334
Fix undefined var
2017-09-26 16:15:22 +02:00
Laurent Destailleur
1002923dea
Fix css
2017-09-26 10:58:24 +02:00
Laurent Destailleur
7f420f3246
Complete vat rates for india
2017-09-26 10:54:07 +02:00
Laurent Destailleur
4f76545b62
Add missing fields to manage localtax on supplier products
2017-09-26 10:47:08 +02:00
Laurent Destailleur
5482f80c0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1
FIX #7473 Mass update of vat rates and other bugs on localtax
2017-09-26 10:29:44 +02:00
Laurent Destailleur
051ca6fdc4
Merge pull request #7162 from hguibourgdev/patch-5
...
NEW Can show stock in alert even if alter is set to 0
2017-09-25 18:17:18 +02:00
Regis Houssin
16941f1d9d
Fix: uniformize code
2017-09-25 16:46:13 +02:00
Laurent Destailleur
e3da4188e2
GETPOST must not clean data for text input.
2017-09-25 00:16:52 +02:00
Laurent Destailleur
934edd9f5a
Merge branch 'develop' into 6.0-api
2017-09-24 22:01:07 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Laurent Destailleur
fc5c9ad2f2
Merge pull request #7436 from fappels/6.0_Fix_expedition_error_handling
...
Fix batch required for lot product error message.
2017-09-20 17:33:05 +02:00
Regis Houssin
77fea1983c
Fix: wrong supplier product price id
2017-09-20 16:57:38 +02:00
Laurent Destailleur
1e33495f42
Fix remove warnings
2017-09-19 00:31:51 +02:00
Regis Houssin
cdd1473cfa
Fix: avoid Warning: A non-numeric value encountered
2017-09-18 16:30:01 +02:00
Laurent Destailleur
291a0d46e6
Fix edit of categories
2017-09-18 01:39:39 +02:00
Laurent Destailleur
dece156a99
NEW Add supplier proposals into stats of product page.
2017-09-17 18:08:43 +02:00
Laurent Destailleur
a3c555049d
NEW Add supplier proposals into stats of product page.
2017-09-17 18:08:23 +02:00
Laurent Destailleur
ad40d27324
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2017-09-16 12:22:18 +02:00
Laurent Destailleur
8773a6860f
Fix HTML5 use of <br> is preferred to <br />
2017-09-15 23:49:04 +02:00
Laurent Destailleur
48ae76e295
Fix picto on service
2017-09-15 19:13:40 +02:00
Laurent Destailleur
55e31796d2
Code comment
2017-09-15 19:08:39 +02:00
Josep Lluís
c43515f484
Fix: Custom info view in services
...
In services view, custom info should be hide.
Also, Nature field is moved and grouped with product fields
2017-09-15 17:11:03 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
f5d2283093
USe second parameter in GETPOST
2017-09-15 10:52:53 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
8f5206accf
NEW The lot of a product uses the link and picto when shown into list.
2017-09-15 10:45:41 +02:00
Laurent Destailleur
eadfbfe2bd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
2017-09-13 20:57:53 +02:00
Laurent Destailleur
149ab80b3a
The event array of an object is visible even if no event yet recorded.
2017-09-13 14:18:36 +02:00
Laurent Destailleur
724817139d
Start remove $GLOBALS
2017-09-12 19:49:07 +02:00
Laurent Destailleur
939d33cce7
Fix bug reported by scrutinizer
2017-09-12 19:12:39 +02:00
Laurent Destailleur
47d2350ad4
Fix bugs reported by scrutinizer
2017-09-12 19:03:12 +02:00
Laurent Destailleur
d572e1ddad
Fix duration output
2017-09-12 17:30:18 +02:00
fappels
681c2a67bd
Fix batch required for lot product error message.
2017-09-11 23:22:44 +02:00
Laurent Destailleur
cb0c7d6594
Standardize search field name
2017-09-11 00:10:23 +02:00
Laurent Destailleur
cb7456239b
Remove deprecated file
2017-09-11 00:03:05 +02:00
Laurent Destailleur
cf56da8102
NEW Default filter and sort order can use partial list of query
...
parameters to set the qualified URLs.
2017-09-11 00:02:52 +02:00
Laurent Destailleur
4f52871c67
Merge pull request #7345 from AXeL-dev/develop
...
fix hidepriceinlabel when using ajax autocompleter
2017-09-08 21:22:38 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
AXeL-dev
a615a46a5a
fix hidepricelabel when using ajax autocompleter
2017-09-08 11:06:55 +01:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
fappels
533881e620
Fix supplier prices not shown when best buy hidden
...
only show value if item has supplier
2017-08-25 11:58:34 +02:00
Laurent Destailleur
4337001418
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/list.php
2017-08-24 14:26:45 +02:00
Laurent Destailleur
bf1f60b31e
Merge
2017-08-23 17:14:29 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
6b5b10fc94
FIX #7224
2017-08-23 16:28:34 +02:00
Laurent Destailleur
f3ef6448d7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
2017-08-23 16:11:51 +02:00
Regis Houssin
2492b9968a
Fix: missing scandir
2017-08-23 10:21:10 +02:00
Regis Houssin
6dda2f3670
Fix: "scandir" in url is blocked in some providers
2017-08-23 10:07:00 +02:00
Laurent Destailleur
681623c3ab
Merge branch 'develop' into patch-1
2017-08-22 11:43:25 +02:00
Laurent Destailleur
7d57cd6913
Update productcustomerprice.class.php
2017-08-22 11:38:32 +02:00
Laurent Destailleur
097b660c41
Mutualize code
2017-08-18 16:25:00 +02:00
Laurent Destailleur
e9eefb170f
Merge pull request #7212 from ATM-Marc/NEW_price_formObjectOptions_hook
...
NEW hook formObjectOptions in the form setting product selling price
2017-08-17 18:25:30 +02:00
Laurent Destailleur
40b3c7c4d5
Merge pull request #7253 from altatof/fix_restrictedarea_parms
...
FIX : same logic for setting fieldvalue and fieldtype
2017-08-17 17:22:36 +02:00
altatof
650e4eaa50
FIX : same logic for setting fieldvalue and fieldtype
2017-08-10 16:41:09 +02:00
Laurent Destailleur
402e6bf650
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/index.php
htdocs/compta/paiement/list.php
htdocs/core/modules/modCron.class.php
2017-08-04 15:39:00 +02:00
Laurent Destailleur
7c840b8348
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-08-04 15:32:30 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
c8b79214cd
Fix translation
2017-08-02 14:53:42 +02:00
Laurent Destailleur
025ecd4ecc
Fix default value for inventory code during a stock correction
2017-08-02 14:21:20 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
florian HENRY
53add04a2e
fix :add missing hook into product price card
2017-07-31 10:28:24 +02:00
Marc de Lima Lucio
2cb89b2d8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_price_formObjectOptions_hook
2017-07-27 17:16:58 +02:00
Marc de Lima Lucio
677d50df5b
NEW: add 'formObjectOptions' hook to the form setting the product selling price
2017-07-27 17:11:15 +02:00
Laurent Destailleur
5bf10737d9
Merge branch 'develop' into patch-14
2017-07-25 18:32:36 +02:00
Laurent Destailleur
4ef36746bd
Merge pull request #7199 from hguibourgdev/patch-13
...
NEW : Add toolkit for StockLimit and DesiredStock
2017-07-25 18:31:12 +02:00
Laurent Destailleur
f6ab691c08
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-25 01:22:29 +02:00
Laurent Destailleur
aff61fad7d
Fix new generic classes system
2017-07-25 01:21:20 +02:00
hguibourgdev
6b9d25708b
NEW : Add toolkit for StockLimit
2017-07-24 21:05:21 +02:00
hguibourgdev
e1f8cfd474
NEW : Add toolkit for StockLimit and DesiredStock
2017-07-24 20:59:46 +02:00
Laurent Destailleur
929d14c816
Merge pull request #7078 from atm-florian/dev_prodlist
...
NEW : filter on extrafield on product list (as in company list)
2017-07-21 15:15:11 +02:00
hguibourgdev
4b0638dd40
Update list.php
...
FIX copy-paste error (sell versus buy)
2017-07-18 14:43:03 +02:00
hguibourgdev
4633d1ae7e
Update list.php
...
FIX copy-paste error (sell versus buy)
2017-07-15 19:04:10 +02:00
hguibourgdev
3825e7fd52
Update replenish.php
...
FIX ">=" instead of ">" for alert test in order to work when negatif stock are allowed
2017-07-15 18:55:52 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
florian HENRY
8e3c2af7ee
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_prodlist
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
2017-07-10 16:16:11 +02:00
fappels
13d6664ab4
Fix delete product from product card
2017-07-09 12:47:51 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
a9468ad84a
Look and feel v6
2017-07-08 00:42:55 +02:00
Laurent Destailleur
608e9e1c82
Look and feel v6 (no amount symbol into list)
2017-07-07 19:48:35 +02:00
Laurent Destailleur
de24e93cca
Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list
...
NEW: Add column with nbr suppliers prices and WAP to product list.
2017-07-07 19:42:25 +02:00
Laurent Destailleur
b7af0cca63
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/holiday/card.php
2017-07-07 19:39:57 +02:00
Laurent Destailleur
aa4ff464d6
Merge pull request #7096 from fappels/6.0_fix_virtual_stock_read_rights_third_parties
...
FIX: Ignore third party read rights filter for virtual stock calculation.
2017-07-07 19:34:12 +02:00
Laurent Destailleur
4c0fcb2b9a
Fix total with tax does not include local taxes. To solve, i show both
...
totals.
2017-07-07 14:58:57 +02:00
Laurent Destailleur
8abec461a6
Fix total with tax does not include local taxes. To solve, i show both
...
totals.
2017-07-07 12:31:00 +02:00
fappels
857e45baf3
Fix comment
2017-07-06 15:34:10 +02:00
Laurent Destailleur
95cf36c43b
Fix use the getUrl function instead of hard coded curl
2017-07-04 10:55:53 +02:00
fappels
78283b6a0b
Ignore rights filter for virtual stock calculation.
2017-06-30 17:02:50 +02:00
fappels
989084e4de
WAP always 2 decimals
2017-06-30 10:56:05 +02:00
arnaud
ca6ce2ba8b
FIX status were wrong on product referent list
2017-06-30 10:38:54 +02:00
florian HENRY
53510ac660
NEW : filter on extrafield on product list (as in company list)
2017-06-29 10:14:48 +02:00
Laurent Destailleur
adf281c4f3
Look and feel v6
2017-06-27 17:42:07 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
Laurent Destailleur
c213624c14
Fix migration into product_lot
2017-06-27 16:42:37 +02:00
Laurent Destailleur
77ba5a8c24
Fix reception of product interface
2017-06-27 14:02:01 +02:00
fappels
e3f7402e07
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list
2017-06-26 22:45:18 +02:00
fappels
13e5c8ff7a
Create patch
...
Add Number of supplier prices and wap columns
2017-06-26 22:44:56 +02:00
Laurent Destailleur
59bd4749a8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/class/product.class.php
2017-06-24 10:27:10 +02:00
Laurent Destailleur
1211e0d7ab
FIX vat code not saved during product creation.
2017-06-23 12:09:21 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Laurent Destailleur
bb2d27280b
Fix sort link must be disabled for computed field
2017-06-19 14:31:08 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
BENKE Charlene
e98bc90489
introduce OZ : once weight
2017-06-17 10:18:59 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
e4c7f584e3
Fix option STOCK_SUPPORTS_SERVICES (stock not visible when it should)
2017-06-13 11:45:21 +02:00
Laurent Destailleur
5def2d2600
Add div to help debug of html content
2017-06-13 11:14:52 +02:00
phf
b67a14c7d6
Fix ajax search product is broken
2017-06-13 10:20:26 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
Laurent Destailleur
64a6ff9687
Fix test for navigation disabling for external users
2017-06-12 16:26:25 +02:00
Laurent Destailleur
cd08690646
Fix ajax search product that return bad json response
2017-06-12 12:42:06 +02:00
Laurent Destailleur
8f7371cdf0
Product has 2 status. Add span to differentiate for css
2017-06-12 12:24:42 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
1af74b4c42
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Laurent Destailleur
1935de03c7
Fix bad consistency of labels
2017-06-09 12:01:55 +02:00
Laurent Destailleur
02781b41ca
Fix several problem with hook printFieldListWhere
2017-06-09 11:02:34 +02:00
Laurent Destailleur
b92980c6ff
Fix statistics on products
2017-06-09 10:38:06 +02:00
Laurent Destailleur
bec6ad9fb3
Fix bad position of hook
2017-06-09 10:22:07 +02:00
Laurent Destailleur
d6ba16d357
Fix missing printFieldListWhere hook
2017-06-09 09:45:22 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c
Fix security
2017-06-08 14:33:46 +02:00
Laurent Destailleur
543630e487
Fix missing count of nb of columns into lists
2017-06-08 14:14:06 +02:00
Laurent Destailleur
7587a3d592
Merge branch 'develop' into develop_transverse
2017-06-08 10:25:04 +02:00
Laurent Destailleur
cfe9d02bc3
Merge pull request #6952 from atm-ph/fix_search_extrafield_on_list
...
Fix can't use search on all extrafields on list
2017-06-08 10:18:55 +02:00
Regis Houssin
b183c6e7ac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_transverse
2017-06-07 20:23:24 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
phf
707a9e40c0
Fix can't use search on all extrafields on list
2017-06-06 12:01:49 +02:00
Regis Houssin
03df365eea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse
2017-06-06 11:01:42 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
77df19009d
Removed duplicated code
2017-06-01 12:11:45 +02:00
Laurent Destailleur
48a6e9e038
Removed not used files
2017-05-30 22:31:57 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
425192ef84
Merge branch 'develop' into 6.0-multijournal
2017-05-29 10:23:46 +02:00
Alexandre SPANGARO
e89c4e9f41
Merge remote-tracking branch 'uptream/develop' into 6.0-pcard
2017-05-25 07:15:03 +02:00
Alexandre SPANGARO
1f079fac9d
Move html.formventilation.class.php to html.formaccounting.class.php
2017-05-25 06:57:28 +02:00
Laurent Destailleur
1a8884bbbe
NEW Can filter on year and product tags on the product statistic page
2017-05-22 15:20:52 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Alexandre SPANGARO
d834cbf7ba
Use getNomUrl for accounting account in product card
2017-05-21 15:24:16 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
e4ec5aa9a9
Merge pull request #6818 from atm-alexis/NEW_poc_list_product_with_listview
...
NEW poc list product with listview
2017-05-19 18:21:49 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
f3838ee8f2
Fix limit into message
2017-05-17 18:52:01 +02:00
Laurent Destailleur
c224e2b4f6
Remove table that does not exists
2017-05-17 16:05:26 +02:00
Laurent Destailleur
1d6b4cb28a
Look and feel v6
2017-05-17 15:25:09 +02:00
Laurent Destailleur
a8afa547f0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
2017-05-17 15:20:17 +02:00
Laurent Destailleur
e2a7b0943f
Clean dead code
2017-05-17 14:52:27 +02:00
Laurent Destailleur
d86b42b024
Missing title, bad css
2017-05-17 14:45:08 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
4dc7d5cd8d
Fix : tooltip on bank in customer invoice card
2017-05-14 21:20:35 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
5581e5da72
FIX New vat code not correctly implemented if "1 price per customer".
2017-05-12 13:12:17 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
5e54567558
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2
Fix label "total for this page" on last page.
2017-05-10 11:57:59 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
alexis portable
8272408b6e
fix travis case statement
2017-05-09 14:43:54 +02:00
alexis portable
651ea92657
NEW fix listview class and add a demo for product list
2017-05-09 14:26:47 +02:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28:07 +02:00
Laurent Destailleur
d948447600
Add button to disable all personalized default values in one click.
2017-05-06 17:08:38 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
768df56c07
Uniformize name of standard PDF template
2017-05-04 20:16:55 +02:00
Laurent Destailleur
c196e79bf4
Merge branch 'develop' into FIX_inventory
2017-05-04 13:50:53 +02:00
Laurent Destailleur
1a6c118a5d
Fix travis warning
2017-05-04 12:41:29 +02:00
Laurent Destailleur
8009370f04
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/contact/document.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/repair.sql
2017-05-04 10:01:11 +02:00
alexis Algoud
6138d197e4
FIX major issues for inventory
...
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
2017-05-02 15:19:55 +02:00
Laurent Destailleur
1e3384a842
Fix travis
2017-04-30 14:16:58 +02:00
Laurent Destailleur
072eb740c7
Fix php compatibility
2017-04-30 13:57:13 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
Laurent Destailleur
b57bf6460b
Start debug inventory
2017-04-30 02:34:00 +02:00
Laurent Destailleur
4993a43025
Move new feature inventory into module stock.
2017-04-30 02:25:05 +02:00
Laurent Destailleur
92b5f8d85e
Move new feature inventory into module stock.
2017-04-29 21:53:01 +02:00
Laurent Destailleur
50d65e3a9f
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
2017-04-29 17:40:47 +02:00
Laurent Destailleur
cd099bf3b1
Fix bad update of prices
2017-04-24 12:42:54 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
3e9ccc186a
NEW Small PDF template for products
2017-04-13 10:26:12 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
b054ca8267
NEW Introduce mass action on product list ('delete' for the moment)
2017-04-09 15:02:55 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
ea44e14b60
Start debug the variant module
2017-04-07 11:01:12 +02:00
Laurent Destailleur
f598bf8bef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
18fc5bec9b
Better log
2017-04-06 10:56:37 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
979bcd3a9b
NEW Can add a background image on login page
2017-03-31 11:40:31 +02:00
Laurent Destailleur
8e70c4a0b7
Work on 6.0 new look and feel
2017-03-30 15:39:50 +02:00
Laurent Destailleur
54b03a3552
Work on 6.0 new look and feel
2017-03-29 11:03:13 +02:00
Laurent Destailleur
219bcb0d54
Work on 6.0 features.
2017-03-27 22:44:50 +02:00
BENKE Charlie
d8018f7937
add trigger on product price add/update
2017-03-26 19:16:19 +02:00
BENKE Charlie
ec3402a04b
Update note.php
2017-03-25 10:52:03 +01:00
BENKE Charlie
656875acb5
Update info.php
2017-03-25 10:49:57 +01:00
BENKE Charlie
a1db02cc08
Update fournisseurs.php
2017-03-25 10:48:50 +01:00
BENKE Charlie
cf68039c36
Update document.php
2017-03-25 10:47:42 +01:00
BENKE Charlie
2e6ab393df
add next_prev_filter for pagination
2017-03-25 10:45:01 +01:00
Laurent Destailleur
2f4a4f493e
Missin translation
2017-03-25 01:47:52 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
ee8112dde7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/projet/class/project.class.php
2017-03-21 19:20:14 +01:00
Laurent Destailleur
43e70830ed
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-03-21 17:18:41 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Laurent Destailleur
dfc1ed7d72
FIX #6535
2017-03-16 22:49:02 +01:00
Laurent Destailleur
9827887643
Merge pull request #6519 from marcosgdf/bug-multiprices
...
FIX Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error
2017-03-14 10:45:47 +01:00
Laurent Destailleur
d951114c18
Merge branch 'develop' into NEW_odt_others_objects
2017-03-14 10:44:05 +01:00
arnaud
192a825de8
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
2017-03-14 09:25:29 +01:00
Marcos García de La Fuente
15d0e6abc5
Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error
2017-03-13 20:33:21 +01:00
Laurent Destailleur
7103d7921e
Uniformize look
2017-03-11 13:42:16 +01:00
Laurent Destailleur
696100b9e7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-11 12:45:57 +01:00
Laurent Destailleur
f06126c463
Fix style
2017-03-11 12:45:18 +01:00
Laurent Destailleur
d1fe6a408c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-11 12:41:47 +01:00
Laurent Destailleur
910859145f
Fix filter on lot was lost
2017-03-11 12:40:47 +01:00
Laurent Destailleur
4e6ee4d12c
Fix dol_banner on card for lot
2017-03-11 12:37:18 +01:00
Laurent Destailleur
53238c2b0d
Fix sort order and number of lines
2017-03-11 12:27:42 +01:00
Laurent Destailleur
4ca634b41c
Better look and feel
2017-03-11 12:04:28 +01:00
Laurent Destailleur
c72e7c1057
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
arnaud
a796a321cc
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
2017-03-10 12:16:55 +01:00
Laurent Destailleur
4b63834868
Merge pull request #6488 from atm-quentin/develop
...
NEW filter checkbox to add draft order in replenish
2017-03-10 11:54:44 +01:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
Quentin Vial-Gouteyron
bf8d510541
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2017-03-06 15:52:59 +01:00
Quentin Vial-Gouteyron
b378279440
New_filter_to_add_draft_order_to_validated_one
2017-03-06 15:50:17 +01:00
Laurent Destailleur
c260325863
Lang not loaded
2017-03-06 12:32:07 +01:00
Laurent Destailleur
f291e1c470
Fix test on qty for stock move
2017-03-06 12:30:59 +01:00
Laurent Destailleur
4e4045d18a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:12:08 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
832c91417a
Fix the default_vat_code was not correctly saved and shown on the
...
product price.
2017-03-04 19:16:09 +01:00
Laurent Destailleur
a5019e1619
Fix position of field
2017-03-04 18:17:04 +01:00
Laurent Destailleur
bbd32b9294
Fix bad count
2017-03-04 14:34:43 +01:00
fmarcet
e1f459d67a
Fix: Error when references are numeric
2017-03-03 12:57:52 +01:00
BENKE Charlie
29cb5dd545
FIX input stock value not display
...
the good array is "value" (like in the card tabs who give the right value)
2017-03-03 11:48:04 +01:00
Laurent Destailleur
0f11a42fe4
Fight against useless colspan
2017-02-28 19:03:39 +01:00
Laurent Destailleur
58229907d4
Removed not used class "Service". Reduce nb of request on dashboard.
2017-02-28 12:35:55 +01:00
Laurent Destailleur
170ad1a265
Depreciate a class not really used
2017-02-27 00:56:44 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
fc6fb61476
Minor fix in typo
2017-02-22 02:19:05 +01:00
Laurent Destailleur
19e60f03b9
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
Laurent Destailleur
d72e5a3646
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-10 17:34:23 +01:00
Laurent Destailleur
ad308e33cc
Fix scrutinizer warning
2017-02-09 18:29:04 +01:00
Laurent Destailleur
e0850b29cd
Merge pull request #6399 from fappels/5.0
...
Qual reputation for price supplier
2017-02-08 16:42:20 +01:00
fappels
b1fe8e3f2b
fix merge
2017-02-08 13:45:42 +01:00
fappels
a84c6f9b45
Qual reputation for price supplier
...
Move available reputation constants from view-controller to class
2017-02-08 13:35:34 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
31c3398b7f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
Laurent Destailleur
c6e0a4cc87
Fix column label
2017-02-07 12:39:45 +01:00
Laurent Destailleur
fcbc12ce31
Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project
...
New link movement stock to project
2017-02-06 20:45:04 +01:00
Laurent Destailleur
aa1c14e508
Remove change of PMP when we should not
2017-02-06 20:43:44 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
64da0e77d5
Merge pull request #6358 from defrance/patch-71
...
FIX : fill fourn remise percent with select product mode
2017-02-02 02:27:35 +01:00
Laurent Destailleur
13f37b2cb9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:25:49 +01:00
Laurent Destailleur
6b1e81fa1d
Fix missing space
2017-02-02 02:22:01 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
924a08a078
Fix code should use 5.0 framework
2017-02-01 16:24:40 +01:00
Laurent Destailleur
9a9b31c9c0
Fix cancel button + logic to close project when setting opp to WON/LOST.
2017-02-01 13:25:16 +01:00
BENKE Charlie
772d862766
Update product.class.php
2017-01-31 23:13:58 +01:00
atm-ph
8e9a9637a0
Fix travis
2017-01-30 21:52:52 +01:00
atm-ph
ccad6d6dde
New show on project "overview" tab the informations about movements stock
2017-01-29 13:36:33 +01:00
atm-ph
56d75c552d
New movement stock can be linked to project
2017-01-29 13:04:06 +01:00
BENKE Charlie
e73a132ed9
PHP7 warning error on $page not affected
2017-01-25 16:24:12 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Gustavo Novaro
22a815a1b4
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-17 01:21:44 -03:00
Laurent Destailleur
fafe71ec52
Fix autocalculation of surface and volume.
2017-01-16 10:55:33 +01:00
Laurent Destailleur
1b1bab94ca
More complete commit for #6114
2017-01-16 10:43:22 +01:00
Laurent Destailleur
81d76f8600
Merge pull request #6114 from defrance/patch-52
...
NEW Allow to change heigth and width on product
2017-01-16 10:19:47 +01:00
Laurent Destailleur
846e827e09
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:49:11 +01:00
Laurent Destailleur
f5458b4337
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/core/class/html.formfile.class.php
htdocs/product/stats/card.php
2017-01-16 00:48:37 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Regis Houssin
c3997194b2
Fix: avoid foreach error
2017-01-15 15:17:32 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
6aa26e0f62
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
2017-01-13 16:49:18 +01:00
Laurent Destailleur
380b61a0e9
FIX Can make a stock transfert on product not on sale/purchase.
2017-01-12 21:56:50 +01:00
Gustavo Novaro
751aa2a2aa
Improve code style
2017-01-12 12:11:45 -03:00
Laurent Destailleur
2c6672d17a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/login.tpl.php
2017-01-12 11:32:51 +01:00
florian HENRY
2c2bb366bd
fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of
...
"NULL")
2017-01-11 09:19:07 +01:00
arnaud
b813144edb
NEW generation ODT
2017-01-06 16:44:09 +01:00
Laurent Destailleur
febd23fe41
Clean dead code
2017-01-03 11:22:03 +01:00
Laurent Destailleur
1f2f03c287
Merge pull request #6222 from gnovaro/patch-4
...
var to public
2016-12-31 17:27:07 +01:00
Laurent Destailleur
2c4e8926f8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-31 17:24:14 +01:00
Laurent Destailleur
f46ce68d08
NEW Can sort thumbs visible on product card
2016-12-31 16:16:20 +01:00
Marcos García de La Fuente
154425e2bc
Fixed PHP fatal error
2016-12-27 16:13:39 +01:00
Laurent Destailleur
b5c815367c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-26 15:44:31 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
Gustavo Novaro
191f69ec79
var to public
...
Improve code style
2016-12-23 14:06:11 -03:00
florian HENRY
30b4d9e2e5
fix : avoid bug when batch number is not trimmed
2016-12-23 12:10:55 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
Laurent Destailleur
ba7ca3da6e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop6
Conflicts:
htdocs/core/photos_resize.php
htdocs/install/mysql/data/llx_c_action_trigger.sql
2016-12-22 17:57:42 +01:00
Laurent Destailleur
ed0ffd6f5a
NEW Uploaded files are indexed into database
2016-12-20 19:42:25 +01:00
Laurent Destailleur
0eded9a8b7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-19 02:36:10 +01:00
Laurent Destailleur
3f5d67d4d6
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-19 02:35:16 +01:00
Laurent Destailleur
876722733a
Better fix to get localtax
2016-12-19 02:33:54 +01:00
Laurent Destailleur
ac44aa6d81
FIX security bugs
2016-12-18 13:24:06 +01:00
Laurent Destailleur
a736f3782c
FIX security bugs
2016-12-18 13:21:09 +01:00
gauthier
1f1c75adfb
FIX : HT and TTC price should always be displayed together
2016-12-14 15:50:50 +01:00
Laurent Destailleur
ecab7cb70e
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/class/product.class.php
2016-12-14 12:29:41 +01:00
Laurent Destailleur
d2e4888bdd
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-14 12:21:33 +01:00
Laurent Destailleur
43d18cd70c
FIX if a supplier price reference is changed after creating an order, we
...
can't clone order.
2016-12-13 13:22:24 +01:00
Juanjo Menent
5c4ab99a9a
Merge pull request #6132 from simnandez/3.9
...
Fix #5646 Error editing Sell Price on products/services
2016-12-11 14:32:00 +01:00
Juanjo Menent
3abbb2a3e5
Fix Uniformize status alignment
2016-12-11 14:19:23 +01:00
BENKE Charlie
37d734387b
print_barre_liste only on top of list
2016-12-11 14:03:48 +01:00
Laurent Destailleur
190f432c23
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-11 11:07:22 +01:00
Laurent Destailleur
4969af8c74
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
ChangeLog
htdocs/product/card.php
2016-12-11 11:04:15 +01:00
Laurent Destailleur
95d8faef04
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/product/class/product.class.php
2016-12-11 10:51:15 +01:00
Laurent Destailleur
7fd75c793a
FIX Regression when deleting product
2016-12-11 10:39:48 +01:00
Juanjo Menent
aa2d783aaa
Merge pull request #6134 from atm-maxime/fix_photo_product
...
Fix product photo in tooltip
2016-12-11 10:21:31 +01:00
Laurent Destailleur
144743df6d
Merge pull request #6131 from defrance/patch-57
...
Bad return on linkback
2016-12-11 02:57:23 +01:00
Laurent Destailleur
9b436ce871
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/product/class/product.class.php
2016-12-11 02:51:32 +01:00
Laurent Destailleur
b42a2616bc
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-12-11 02:34:59 +01:00
BENKE Charlie
b7af046147
Add automated compute
2016-12-11 01:53:33 +01:00
Maxime Kohlhaas
3befe1b83f
Fix product photo in tooltip
2016-12-10 23:34:32 +01:00
Juanjo Menent
56aafa4660
Fix #5646 Error editing Sell Price on products/services
2016-12-10 23:25:13 +01:00
BENKE Charlie
8589f077c0
Bad return on linkback
2016-12-10 22:54:13 +01:00
aspangaro
31fcf9aff9
Fix warehouse presentation
2016-12-10 22:13:06 +01:00
Laurent Destailleur
518049bed4
Fix pagination
2016-12-10 19:26:58 +01:00
Laurent Destailleur
cdba7cfa1c
Clean api rest
2016-12-10 19:04:56 +01:00
Laurent Destailleur
ce41c84c95
Fix td class
2016-12-10 16:00:33 +01:00
BENKE Charlie
300c91fd7f
Update card.php
2016-12-10 13:25:33 +01:00
BENKE Charlie
7c7626e445
allow to change height and width
2016-12-10 13:19:33 +01:00
Maxime Kohlhaas
97e21cb775
Fix : delete product was not possible if batch stock
2016-12-10 13:05:46 +01:00
Sergio Sanchis Climent
79d6fa334b
FIX: Consistent description for add or edit product
2016-12-08 13:12:10 +01:00
Laurent Destailleur
d23604701c
Fix responsive
2016-12-07 15:00:20 +01:00
fappels
bbbc768fa7
Change filter parameter to string with comma seperated values
...
Change warehousefilter from int to string with comma seperated values
for selectWarehouses and select_produits form functions.
2016-12-06 20:07:19 +01:00
fappels
c3b43e18d1
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
2016-12-05 18:15:08 +01:00
fappels
3ca9664595
Filter stock on warehouse status for replenishment
...
Do not show stock of closed warehouse
2016-12-05 18:14:42 +01:00
fappels
18478eaa31
Add warehouse status filter to load_stock function
2016-12-05 18:08:09 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
fappels
fbdc0c25e3
Add STATUS_OPEN_INTERNAL to stock change/move pages
2016-12-05 11:42:03 +01:00
fappels
c911f906c8
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
2016-12-05 11:36:20 +01:00
Laurent Destailleur
f3bf5f82f8
FIX Minor fix on stock rounding for float qty before output on screen.
2016-12-05 11:18:54 +01:00
fappels
a7a20f45a1
Remove Only shipping and dispatch status
...
Remove Only shipping and dispatch status, better to create new future
option 'Routing' for this.
2016-12-02 11:03:21 +01:00
Sergio Sanchis Climent
6dfeaabad5
FIX : #6062
2016-12-01 22:28:29 +01:00
fappels
2d4807190e
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
2016-11-30 13:03:24 +01:00
fappels
49442c0b7f
Add filter on warehouse status to object line product list
2016-11-30 13:03:17 +01:00
Laurent Destailleur
592b9d0b20
Merge pull request #6061 from mrsof/patch-6
...
Fix: Product barcode generation in edit mode
2016-11-29 23:34:18 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
Sof
e05de2942b
Fix: update informations
2016-11-29 12:19:01 +01:00
Sof
53d1dbf4b9
Fix: Codebar suggestion in edit mode
2016-11-29 12:06:58 +01:00
Laurent Destailleur
663f7938f8
Fxi responsive design
2016-11-27 20:02:57 +01:00
Marcos García de La Fuente
cf0ee36150
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-11-27 18:10:01 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Laurent Destailleur
e6fb118155
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-11-26 15:52:17 +01:00
Laurent Destailleur
b63ad019ce
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-11-26 15:49:11 +01:00
Laurent Destailleur
e539842c28
Fix eatdate and selldate not correctly set.
2016-11-26 15:46:41 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
Laurent Destailleur
5acd09b2d5
Fix require_once instead of require.
2016-11-24 17:03:18 +01:00
Laurent Destailleur
da92be1a9f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fichinter/card.php
htdocs/fourn/facture/card.php
2016-11-22 20:55:57 +01:00
Laurent Destailleur
cbd85f7b82
FIX #5958 no discount on supplier command made by replenishment
2016-11-22 20:50:13 +01:00
Laurent Destailleur
12350f180a
Merge pull request #5993 from fappels/develop-product-delete-batch
...
Fix Delete from product_batch on product delete
2016-11-22 19:33:07 +01:00
Scrutinizer Auto-Fixer
2a62564768
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-11-22 18:16:17 +00:00
fappels
c09d09b869
Remove hasbatch test
...
Intention is to remove all data linked to product_stock, which will be
deleted.
2016-11-20 22:30:40 +01:00
Laurent Destailleur
34b42d5913
Merge pull request #6008 from defrance/patch-44
...
if supplier have multiple price return it several times
2016-11-19 21:08:59 +01:00
Laurent Destailleur
e6a027911d
Merge pull request #5997 from fappels/develop-fix-modify-warehouse
...
Fix #5994 unable to update warehouse
2016-11-19 20:58:54 +01:00
Laurent Destailleur
dd27a52a85
Fix several problems on new REST API on project/tasks
2016-11-19 16:08:27 +01:00
Laurent Destailleur
7ac96da0d4
Several fix in warehouse stock change (rounding, api rest)
2016-11-18 16:34:03 +01:00
Laurent Destailleur
9b66f8c320
Complete REST services
2016-11-18 13:12:44 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
BENKE Charlie
8a37db3f1c
if supplier have multiple price return it several times
2016-11-18 08:23:12 +01:00
fappels
ed8edfceaf
code intend
2016-11-15 20:01:16 +01:00
fappels
eeb62ea2b8
Fix update entrepot
...
fix int for fk_parent
clean parenthesis
fix clean parameter country_id
2016-11-15 19:56:58 +01:00
fappels
2e6b27f094
Delete from product_batch on product delete
2016-11-15 11:29:12 +01:00
Laurent Destailleur
ecbe719f23
FIX Several problems into shipment management with lot enabled
2016-11-14 13:40:41 +01:00
Laurent Destailleur
381b77850c
Fix do not show cloning of virtual product if option is off
2016-11-14 02:08:41 +01:00
Laurent Destailleur
b79048e6bd
Fix cloning virtual products
2016-11-14 01:46:59 +01:00
Laurent Destailleur
899ba6d90b
NEW Add option to include parent products too in stats of orders
2016-11-11 14:17:11 +01:00
Laurent Destailleur
e2b7773353
Merge pull request #5943 from atm-alexis/FIX_vitual_product_virtual_stock
...
Fix vitual product virtual stock
2016-11-11 14:11:56 +01:00
Laurent Destailleur
ab269bd7a6
Better responsive
2016-11-11 01:15:41 +01:00
Marcos García de La Fuente
286095f5cd
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-11-06 15:01:40 +01:00
BENKE Charlie
6da82762f2
Update card.php
2016-11-05 11:09:54 +01:00
Laurent Destailleur
e59c2bb61c
Debug accounting menu. Can now edit product account if already set.
2016-11-04 16:15:31 +01:00
Laurent Destailleur
7fa9692458
Uniformize code. Generalize option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE.
2016-11-02 12:48:50 +01:00
Alexis Algoud
8ed13714f7
Merge branch 'develop' into FIX_vitual_product_virtual_stock
2016-10-31 00:04:22 +01:00
Laurent Destailleur
6df4666cf3
Uniformize code
2016-10-30 16:19:31 +01:00
Laurent Destailleur
03b882d095
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-29 19:12:58 +02:00
Laurent Destailleur
7c75d98f9a
FIX #5866
2016-10-29 18:43:12 +02:00
Laurent Destailleur
cc43732c56
Responsive enhancements
2016-10-29 17:02:48 +02:00
Laurent Destailleur
32b6660f63
Uniformize code
2016-10-29 16:18:39 +02:00
Laurent Destailleur
f1ec2c04ed
Uniformize code
2016-10-28 18:40:26 +02:00
Laurent Destailleur
22d2557a48
Clean page
2016-10-28 18:05:46 +02:00
Laurent Destailleur
d866ef66c3
Fix label in title
2016-10-28 17:48:30 +02:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
223047cdf5
Uniformize look and feel on stock movement
2016-10-28 16:05:33 +02:00
Laurent Destailleur
5654a4609e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-10-28 12:00:46 +02:00
Laurent Destailleur
6938b05219
Mutualize code to show files generated for mass actions
2016-10-28 12:00:30 +02:00
BENKE Charlie
632fe49fb9
bad setting on get_entity fournisseur
2016-10-26 16:59:58 +02:00
Laurent Destailleur
7d182c286c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step1.php
htdocs/projet/tasks/time.php
2016-10-26 10:40:03 +02:00
Laurent Destailleur
f67863e1aa
NEW Can use any filter on all REST API to list.
2016-10-25 19:15:47 +02:00
Laurent Destailleur
5d655d47fe
Enhance css
2016-10-25 12:36:14 +02:00
Laurent Destailleur
384abd8462
Uniformize look and feel
2016-10-25 02:56:46 +02:00
Laurent Destailleur
eb37c72513
Uniformise code
2016-10-24 20:56:48 +02:00
Laurent Destailleur
aad4380689
Uniformise code
2016-10-24 20:52:21 +02:00
Laurent Destailleur
3c3c5d06a1
Merge branch 'NEW_parent_warehouse' of
...
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_parent_warehouse
Conflicts:
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-10-24 00:58:02 +02:00
Laurent Destailleur
c44aa8f4d7
Fix warnings
2016-10-21 13:23:39 +02:00
Laurent Destailleur
3111b56b20
Fix navigation for list of product to bound.
2016-10-21 12:45:19 +02:00
gauthier
59941f9980
FIX : must not get full path with recursive query
2016-10-20 14:29:51 +02:00
gauthier
9a3d4031c5
FIX : param $protection - Deep counter to avoid infinite loop
2016-10-20 13:30:47 +02:00
gauthier
d85dd69184
NEW : get_full_arbo() & get_children_warehouses() functions documentation
2016-10-20 13:14:28 +02:00
Laurent Destailleur
79d376ee12
Debug accountancy module
2016-10-14 13:05:01 +02:00
gauthier
012be8e400
NEW : security check to avoid adding a parent warehouse chich is already a child of current one
2016-10-14 12:42:42 +02:00
gauthier
61a3188353
FIX : new parameter documentation
2016-10-14 11:59:07 +02:00
gauthier
1a648cfc89
NEW : getNomUrl displays full path to warehouse
...
# Conflicts:
# htdocs/product/stock/class/entrepot.class.php
2016-10-14 11:53:04 +02:00
gauthier
fe1bcb7e0a
NEW : function to display full path to current warehouse
2016-10-14 11:39:46 +02:00
gauthier
416311a7b9
NEW : allow to save a parent warehouse
...
# Conflicts:
# htdocs/product/stock/card.php
2016-10-14 11:29:14 +02:00
Laurent Destailleur
92dc385307
Merge pull request #5838 from atm-gauthier/develop_NEW_filter_by_supplier_on_replenishment_card
...
Develop new filter by supplier on replenishment card
2016-10-11 20:04:02 +02:00
Laurent Destailleur
710e12420f
Use correct picto for lot
2016-10-10 02:01:30 +02:00
gauthier
fee0a88d27
Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card
2016-10-07 09:25:18 +02:00
gauthier
18496f9159
FIX : params order
2016-10-07 09:19:10 +02:00
Laurent Destailleur
a91f93eeda
Merge pull request #5831 from atm-florian/dev_fix5764_for_PgSQL
...
FIX : New add limit stock product by warehouse #5764 for PgSQL
2016-10-07 00:00:53 +02:00
BENKE Charlie
272b16fe1a
Duplicate product declation
...
Once is enough
2016-10-06 08:36:21 +02:00
gauthier
ee014681b0
Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card
2016-10-05 15:30:23 +02:00
gauthier
9c8ecdc8d8
NEW : filter by supplier on replenish.php
2016-10-05 15:06:30 +02:00
florian HENRY
d3146234b8
FIX : New add limit stock product by warehouse #5764 for PgSQL
2016-10-04 09:23:13 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
43da410b95
FIX #5763 Bug: Cannot Create Supplier Price Request
2016-10-01 16:36:01 +02:00
Laurent Destailleur
b412baa880
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-29 10:49:47 +02:00
Laurent Destailleur
c3f5962058
Normalize code
2016-09-28 18:14:44 +02:00
fappels
acbd00286c
Fix stock decrement of lot qty on delivery
2016-09-26 17:31:55 +02:00
atm-quentin
4d828499ac
Update entrepot.class.php
2016-09-26 14:41:30 +02:00
Quentin Vial-Gouteyron
bf0556bdf1
NEW Trigger on delete stock
2016-09-26 10:47:54 +02:00
Laurent Destailleur
d39d7d92c9
Uniformize code.
2016-09-26 02:13:58 +02:00
Laurent Destailleur
ea09eb13da
Uniformize code
2016-09-26 00:10:29 +02:00
Laurent Destailleur
8fa8bc7d34
Rename table for a better understanding
2016-09-22 11:39:43 +02:00
Laurent Destailleur
cef02a9766
Merge pull request #5764 from atm-gauthier/NEW_add_limit_stock_product_by_warehouse
...
New add limit stock product by warehouse
2016-09-22 09:15:05 +02:00
Laurent Destailleur
d4e324d15a
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture.php
2016-09-21 18:38:30 +02:00
Laurent Destailleur
9c12444a03
Fix size of warehouse and height of confirm box
2016-09-21 18:20:18 +02:00
gauthier
2556e59ccf
NEW : auto delete product_stock_entrepot elements when we drop a product or a warehouse
2016-09-21 16:21:23 +02:00
gauthier
b95b84a665
FIX : doc comment for parameter $fk_product
2016-09-20 15:31:55 +02:00
gauthier
dc15eb079a
FIX : keep params when we search or skip to another page
2016-09-20 14:38:05 +02:00
gauthier
d508d44fef
NEW : migration script from 4.0.0 to 5.0.0 and langs
2016-09-20 12:10:25 +02:00
gauthier
a0ec91cb94
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse
2016-09-20 12:03:55 +02:00
gauthier
a698e40c45
NEW : filter fk_warehouse on replenishment card
2016-09-20 11:55:38 +02:00
gauthier
43e77d23e9
NEW : Delete product stock warehouse
2016-09-19 17:40:59 +02:00
gauthier
a4d0eed503
NEW : Save product stock warehouse in database and display list
2016-09-19 17:33:29 +02:00
Laurent Destailleur
4f842fd2cb
Uniformize look and feel
2016-09-19 13:57:50 +02:00
Laurent Destailleur
c8b8e13014
Work on dol_banner for proposals.
2016-09-18 21:38:20 +02:00
Laurent Destailleur
d1c4f02bf7
Uniformize code and style
2016-09-18 14:41:17 +02:00
Laurent Destailleur
407d9e6904
Merge pull request #5741 from atm-quentin/new_hook_stock_product_develop_dolibarr
...
NEW Hook on stock product card
2016-09-17 18:04:39 +02:00
gauthier
7a0577ccfc
NEW : add limit stock product by warehouse
2016-09-16 17:09:38 +02:00
Quentin Vial-Gouteyron
6d304f4a23
NEW Hook formObjectOptions
2016-09-13 14:56:57 +02:00
Quentin Vial-Gouteyron
f8912267cb
NEW Hook on stock product card
2016-09-13 11:56:39 +02:00
Laurent Destailleur
0ab377440d
Complete param of setValueFrom
2016-09-12 20:16:39 +02:00
Laurent Destailleur
5c1127fc54
NEW Enhance function setValueFrom so we can use it for "edit in form"
...
feature.
2016-09-12 20:00:47 +02:00
Laurent Destailleur
1f9aa856d5
NEW the list of linked files on card does not forget external links.
2016-09-12 18:37:40 +02:00
Laurent Destailleur
2587958c89
Introduce hidden constant PRODUCT_ADD_FORM_ADD_TO for an old feature not
...
used so we can disable/enabled if we want.
2016-09-12 18:15:01 +02:00
Laurent Destailleur
5ea9fc7467
NEW Support extrafields on product lot.
2016-09-12 17:27:44 +02:00
Laurent Destailleur
359ebed882
FIX #5696
2016-09-12 02:57:28 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/expedition/list.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/fourn/commande/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/product/stock/list.php
htdocs/societe/list.php
htdocs/supplier_proposal/list.php
htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
4ea5068966
FIX Clean of search fields
2016-09-12 00:15:27 +02:00
Laurent Destailleur
1bb278a587
Fix #5712
2016-09-11 23:01:04 +02:00
Laurent Destailleur
25c5f40bf1
Add css on picto status
2016-09-10 19:44:55 +02:00
Ferran Marcet
4777faf49b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 14:02:27 +02:00
Ferran Marcet
b5db70342b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 13:58:41 +02:00
Laurent Destailleur
72e149e1a6
FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK.
2016-09-08 12:12:00 +02:00
fappels
6574ebcbff
Replace non existing ref parameter
...
Replace non existing ref parameter with product_id and batch to fetch a
specific batch from a product.
Remove unused sceleton methods.
2016-09-07 12:40:15 +02:00
Marcos García de La Fuente
05728075d6
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-09-06 21:06:33 +02:00
Laurent Destailleur
13746a3c03
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 22:37:59 +02:00
Laurent Destailleur
acdce83f9c
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/product/price.php
2016-09-02 22:37:01 +02:00
Laurent Destailleur
b107b0644f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 22:07:17 +02:00
Laurent Destailleur
8c4324d912
FIX #5674
2016-09-02 21:15:48 +02:00
Laurent Destailleur
4fa94e3a25
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-09-02 19:25:04 +02:00
Laurent Destailleur
ba76f12a28
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/product/price.php
htdocs/product/stock/class/mouvementstock.class.php
2016-09-02 19:24:28 +02:00
Laurent Destailleur
9c8145eb88
Better fix for 416a0892d7
2016-09-02 19:19:13 +02:00
Laurent Destailleur
570c228ee1
Merge pull request #5692 from fmarcet/3.9
...
Fix: An empty variable is used to update multiprice
2016-09-02 18:24:09 +02:00
fappels
aedd813236
Delete product_lot when product deleted
2016-09-02 18:13:25 +02:00
Ferran Marcet
416a0892d7
Fix: An empty variable is used to update multiprice
2016-09-02 12:32:14 +02:00
fappels
1c626c01ee
Ignore time when checking lot dates
2016-09-02 11:29:28 +02:00
aspangaro
a54784588b
Fix: Info tab on product card - Double header
2016-09-01 22:39:01 +02:00
aspangaro
50d46fa126
Fix: Product note & double header
2016-09-01 22:36:02 +02:00
Laurent Destailleur
8fd082cf16
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/hrm/hrm.php
2016-08-31 16:16:19 +02:00
Laurent Destailleur
8cfac3b5c3
FIX Several problems when using smartphone
2016-08-31 12:38:54 +02:00
Laurent Destailleur
524dd79198
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
d6d474f10d
Clean code for category management.
2016-08-29 21:31:27 +02:00
Laurent Destailleur
cd1a12c686
NEW Can edit a label for each price segment when using several segment
...
prices for products.
2016-08-29 16:30:31 +02:00
Laurent Destailleur
8b959a09f2
Fix missing /form
2016-08-29 16:12:56 +02:00
Laurent Destailleur
a9e5668ea4
Fix for jmobile
2016-08-28 16:31:22 +02:00
Laurent Destailleur
989d6e7bc8
Fix responsive design
2016-08-28 16:27:15 +02:00
Laurent Destailleur
92ef3f0cd8
Fix responsive design
2016-08-28 16:17:23 +02:00
Laurent Destailleur
661526f822
Fix for jmobile
2016-08-28 16:00:02 +02:00
Laurent Destailleur
e46bda5f9a
Fix for jmobile
2016-08-28 15:58:52 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Laurent Destailleur
88afc4ad5a
Merge pull request #5625 from aspangaro/4.0-p42
...
Uniformize presentation, add button cancel everywhere
2016-08-17 16:11:59 +02:00
Laurent Destailleur
58fc64982f
Merge pull request #5618 from fappels/4.0_fix_eatby_sellby_check
...
Fix sellby without hour check
2016-08-17 16:10:09 +02:00
aspangaro
b7420372b7
Uniformize presentation, add button cancel everywhere
2016-08-12 22:53:30 +02:00
fappels
f9a9d4d2d8
Fix sellby without hour check
2016-08-11 20:59:56 +02:00
aspangaro
9a0fed93d1
Merge remote-tracking branch 'Upstream/4.0' into 4.0-p37
2016-08-10 07:42:04 +02:00
aspangaro
a1d1396919
Uniformize presentation
2016-08-10 07:40:40 +02:00
Laurent Destailleur
4d4fc87e2b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
2016-08-09 13:26:08 +02:00
Laurent Destailleur
29fdebe0d9
Fix list of lot
2016-08-09 13:21:30 +02:00
Laurent Destailleur
7b6755cfcd
Fix several errors in search an sorting in stock by lot view
2016-08-09 13:14:33 +02:00
Laurent Destailleur
7667dc735e
Fix several errors in search an sorting in stock by lot view
2016-08-09 13:11:56 +02:00
Laurent Destailleur
7c7bcac3c4
Fix lost filter
2016-08-08 22:00:01 +02:00
Laurent Destailleur
4b13a11d9c
Key must be first field
2016-08-08 20:46:08 +02:00
Laurent Destailleur
57cbda416b
Minor fix on stock
2016-08-08 20:41:49 +02:00
Laurent Destailleur
437b796928
Fix search on product ref
2016-08-08 20:34:55 +02:00
Laurent Destailleur
2133b1c3b5
NEW Table with list of lots/serial can be viewed (module product batch).
2016-08-08 20:31:03 +02:00
Laurent Destailleur
bcd055b378
Move button to link to, in same part of code than code to output links.
2016-08-05 15:30:28 +02:00
Laurent Destailleur
e168888c59
NEW Reduce nb of picto on ref into list, merging preview and download
2016-08-05 12:20:11 +02:00
Laurent Destailleur
4cf01bc685
Fix code comment
2016-08-05 04:48:30 +02:00
Laurent Destailleur
e1e8254bcf
Fix thumbs are using same extension than original.
2016-08-05 04:31:19 +02:00
Laurent Destailleur
1b10e27618
Fix bad link
2016-08-05 04:20:38 +02:00
Laurent Destailleur
782ab6a02b
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/modules/barcode/modules_barcode.class.php
htdocs/product/admin/product.php
2016-08-05 00:42:40 +02:00
Laurent Destailleur
c2e81b6edb
Fix colspan
2016-08-05 00:36:58 +02:00
Laurent Destailleur
7a7e7b330f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a
NEW Link between objects can be done on both side and on all objects
2016-08-04 11:57:37 +02:00
florian HENRY
5f415478ac
FIX : update limit stock on product stock
2016-08-03 17:29:04 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Laurent Destailleur
54df49aebe
Fix strict sql
2016-08-02 13:36:16 +02:00
Laurent Destailleur
dfc38351ef
Fix $i not initialized
2016-08-01 19:48:39 +02:00
Laurent Destailleur
621a7d93fa
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-08-01 15:05:57 +02:00
Ferran Marcet
fb2444c7a3
Fix: Can't set PRODUIT_LIMIT_SIZE to value 0
2016-08-01 10:20:10 +02:00
Laurent Destailleur
4e3dd4c927
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-28 14:38:22 +02:00
Laurent Destailleur
aae2086ada
Move notes on dedicated tabs like other elements.
...
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
2016-07-28 13:53:17 +02:00
Laurent Destailleur
629271cf85
FIX Bad position of parameters on llxHeader (so online help not visible)
2016-07-28 12:23:07 +02:00
Laurent Destailleur
e5d0258f33
Fix missing css
2016-07-28 12:22:23 +02:00
Laurent Destailleur
01417b89c3
FIX Bad position of parameters on llxHeader (so online help not visible)
2016-07-28 12:17:00 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
ee0c77a305
Merge branch 'refactor-rest-api' of
...
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-refactor-rest-api
Conflicts:
htdocs/api/admin/explorer.php
2016-07-27 14:06:14 +02:00
Laurent Destailleur
a167d56d5a
Hard code a warning to avoid confusion.
2016-07-26 16:40:37 +02:00
Marcos García de La Fuente
c082505021
NEW Added product attributes feature
2016-07-24 11:27:52 +02:00
BENKE Charlie
66d0d09769
Add : additionnal origin of mouvement
...
Main problem is the difference between folder and the class of project
Maybe one time (for a major version of dolibarr (5, 6 ...) we start to standadisation of all modules
2016-07-23 16:30:12 +02:00
Laurent Destailleur
af09528738
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
...
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Laurent Destailleur
f90946dbde
Fix test on eat and sell date
2016-07-21 19:12:05 +02:00
Laurent Destailleur
80d99651a4
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2016-07-21 18:49:10 +02:00
Laurent Destailleur
3a08a14d56
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-07-21 18:45:53 +02:00
Laurent Destailleur
80354cd8d6
FIX Can correct stock of lot using eatby or sell by date
2016-07-21 18:43:44 +02:00
Laurent Destailleur
2d037eb34e
FIX Direction of movement lost if an error occurs
2016-07-21 18:36:43 +02:00
Laurent Destailleur
441a8c4a74
FIX Can make a movement on "out of sell" products
2016-07-21 18:28:06 +02:00
Laurent Destailleur
b5334b47bd
Code comment. Add missing translation keyword
2016-07-21 16:22:43 +02:00
Laurent Destailleur
774e327831
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/comm/remx.php
htdocs/compta/facture.php
htdocs/langs/en_US/companies.lang
2016-07-21 10:30:51 +02:00
Laurent Destailleur
972d998f7e
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-07-21 10:25:03 +02:00
Laurent Destailleur
5a8c08e6cc
Merge pull request #5481 from defrance/patch-12
...
NEW Add hook "getnomurltooltip" to replace tooltips on getNomUrl functions
2016-07-20 18:23:35 +02:00
Laurent Destailleur
fd034222b1
Merge pull request #5522 from all3kcis/patch-4
...
Update entrepot.class.php
2016-07-20 18:13:13 +02:00
All3kcis
7a549b1c32
Update entrepot.class.php
...
Add trim on "libelle" in create function of entrepot
2016-07-20 16:57:26 +02:00
BENKE Charlie
8830264c0e
tooltip not present on picto, already present in $link
...
and some case they are conflict
2016-07-20 02:27:40 +02:00
BENKE Charlie
f54bc367a4
fix : warning error if no graphfiles
...
append when we have no element present (start from new)
2016-07-20 01:53:06 +02:00
Laurent Destailleur
3fb80d9678
Merge pull request #5334 from defrance/patch-9
...
Replace feature level activation by hidden function
2016-07-19 18:29:09 +02:00
Sof
4d86291527
Fix : syntax error
2016-07-16 19:57:41 +02:00
Sof
4a0668f7ae
Fix : syntax error
2016-07-16 18:33:29 +02:00
Laurent Destailleur
97b03e225b
NEW Add option "Stock can be negative". Off by default.
2016-07-15 19:57:35 +02:00
Juanjo Menent
2ed446d014
FIX Option strict mode compatibility
2016-07-15 19:35:01 +02:00
Laurent Destailleur
1195e3bf0c
FIX Direction of movement lost if an error occurs
2016-07-15 19:35:00 +02:00
Laurent Destailleur
7263b29cb4
Merge pull request #5301 from atm-ph/fix_develop_issue_2858
...
NEW issue 2858 - Option to allow negative transfer
2016-07-15 18:15:20 +02:00
BENKE Charlie
0ba308a9a5
Update product.class.php
2016-07-15 11:52:59 +02:00
BENKE Charlie
26f27487b9
Add hook for additionnal feature on element tooltip
2016-07-14 18:40:49 +02:00
Laurent Destailleur
73f574b649
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/repair.php
2016-07-12 19:30:01 +02:00
Laurent Destailleur
f972b15f5f
FIX #5068
2016-07-12 19:22:14 +02:00
Laurent Destailleur
b72123e7ec
Fix custom code must be visible only for products
2016-07-11 11:43:59 +02:00
Laurent Destailleur
329bdfc9fd
FIX We must take last recent price when using several level of prices
2016-07-11 11:35:38 +02:00
Regis Houssin
4503659cba
Fix: wrong multicompany filter
2016-07-06 16:50:10 +02:00
Laurent Destailleur
061ccadd03
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/list.php
htdocs/fourn/commande/orderstoinvoice.php
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
htdocs/install/pgsql/functions/functions.sql
2016-07-06 15:11:29 +02:00
Laurent Destailleur
e557502504
Fix save of stock limit failed
2016-07-01 17:34:49 +02:00
arnaud
09b824d819
FIX product stats all bloc module without enbaled test
2016-07-01 16:44:05 +02:00
Laurent Destailleur
3611161b67
Fix custom code should not appears on services
2016-06-30 19:35:11 +02:00
phf
8c133d8546
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_develop_issue_2858
...
Conflicts:
htdocs/core/class/ldap.class.php
2016-06-30 17:09:22 +02:00
Xebax
e12e1980fc
REST API: Add comments in the @deprecated tags.
2016-06-22 10:43:35 +02:00
Xebax
70ba8ec78d
REST API: Bring back the existing API (for backward compatibility).
...
Bring back the existing API and mark all the operations as deprecated.
Both the existing and the new API are documented and browsable with the
Restler API Explorer. The existing API appears under "root".
2016-06-22 10:08:54 +02:00
Xebax
9e9e224c46
REST API: fix deleting a product/service.
...
The global variable $user must be set before calling the
Product::delete() method else the check of permissions fails.
2016-06-21 23:08:22 +02:00
Xebax
4a0d554986
Revert "REST API: fix deleting a product/service."
...
This reverts commit d7c8a466b1
2016-06-21 22:54:38 +02:00
Xebax
3b662d6ed8
REST API: improve the API to get/add categories for an item.
...
Move the GET /xxx/{id}/categories requests to the corresponding classes
(Contacts, Products, Thirdparties).
Move the addCustomerCategory() method to the Thirdparties class. Use the
POST verb for the request instead of GET because the request modifies
the state of the server.
2016-06-20 17:56:33 +02:00
Xebax
ce6d7046be
REST API: remove getByCategory() from Products
...
because the same feature is available with GET /products/.
2016-06-20 17:56:33 +02:00
Xebax
9a509dd0ee
REST API: add the 'category' filter in /products/
...
and fix the 'to_sell' and 'to_buy' filters.
2016-06-20 17:56:33 +02:00
Xebax
d7c8a466b1
REST API: fix deleting a product/service.
...
Add a User parameter to the Product::delete() method to explicitly set
the user that performs the action instead of using a global variable.
In the calls to Product::delete() with a fetched object, remove the
deprecated parameter $id.
2016-06-20 17:56:33 +02:00
Xebax
58c25ff665
REST API: fix the error 500 when updating a product.
2016-06-20 17:56:33 +02:00
Xebax
f03d6e1bed
REST API: replace the /product/ API by /products/.
...
Added some FIXME:
- the put() method does its job but the API returns an error 500
- delete() does not work.
2016-06-20 17:56:33 +02:00
Laurent Destailleur
10f2d7cd67
Fix Debug and minor fixes
2016-06-20 10:54:02 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
BENKE Charlie
f40a974812
Job Done
2016-06-17 07:54:35 +02:00
Laurent Destailleur
f94d140d2a
Fix bad sql field name
2016-06-16 13:00:23 +02:00
Laurent Destailleur
5b5b7a2bf9
FIX Bad value used for task warning delay
...
FIX Compatibility datee and date_end for warning of tasks
2016-06-15 14:05:48 +02:00
Laurent Destailleur
6034ba658c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2016-06-10 18:59:05 +02:00
Laurent Destailleur
758f5897d3
Fix Missing message to explain record is saved
2016-06-09 21:22:07 +02:00
BENKE Charlie
db0cf5f03f
remplace level feacture by hidden function
2016-06-09 18:48:36 +02:00
Laurent Destailleur
8b446faa53
Fix field not sortable
2016-06-08 11:59:48 +02:00
Laurent Destailleur
653387ba95
Fix pagination on movement list
2016-06-08 11:58:37 +02:00
Laurent Destailleur
73d465a8e8
Fix missing use of natural_search
2016-06-08 11:44:00 +02:00
Laurent Destailleur
59c6c90200
Remove a FIXME.
2016-06-08 11:40:50 +02:00
Laurent Destailleur
240c4baba8
FIX filter on stock movement
2016-06-08 11:29:48 +02:00
Laurent Destailleur
f5d7c6fda5
Fix translation of desired stock (this is more clear)
2016-06-08 09:57:03 +02:00
Laurent Destailleur
f552f3a7d5
Fix missing $notrigger on product delete
2016-06-07 20:51:06 +02:00
Laurent Destailleur
9019576394
Fix css class opacitymedium was not used everywhere.
2016-06-07 15:58:02 +02:00
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
phf
67392fbac5
Fix move the code into mouvementstock class
2016-06-07 12:27:43 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
phf
c62a69ccc8
Merge branch 'fix_3.7_issue_2858' into develop
2016-06-04 18:54:55 +02:00
Maxime Kohlhaas
c3cf72afcc
Merge pull request #5296 from aschio/develop
...
FIX #5134
2016-06-04 18:46:33 +02:00
cla
b440ad4e7b
FIX #5134 : fixed action 'edit' top page
2016-06-04 18:44:10 +02:00
paolo
ff95bb1644
fix #4467
2016-06-04 18:31:31 +02:00
phf
3cbbdf5e20
Fix #2858
2016-06-04 18:23:22 +02:00
cla
9ac05fa8f2
FIX #5134
2016-06-04 18:17:13 +02:00
Maxime Kohlhaas
3ef9fe2c40
Fix product supplier price modification with multicompany
2016-06-04 18:10:40 +02:00
Juanjo Menent
8f617b196a
Fix printing following the rules
2016-06-04 15:51:28 +02:00
Juanjo Menent
99a28a9dcd
Fix Travis error introduced in commit '236ecf01'
2016-06-03 16:15:27 +02:00
Laurent Destailleur
0f53993c6f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-02 11:24:24 +02:00
Laurent Destailleur
5106f40a56
Merge branch 'develop_NEW_decrease_stock_expedition_classify' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify
Conflicts:
htdocs/expedition/class/expedition.class.php
2016-06-02 11:23:49 +02:00
Laurent Destailleur
b8ee75ce23
Merge pull request #5248 from IonAgorria/patch-2
...
Fix: Fill ref_supplier in product get_buyprice
2016-06-02 10:06:17 +02:00
Laurent Destailleur
40005b8f65
FIX Missing search on barcode, only if defined
2016-06-01 12:15:54 +02:00
Ion Agorria
ade417855b
Fill ref_supplier in product get_buyprice
2016-05-29 13:45:26 +02:00
Juanjo Menent
d8897214cd
Fix issues with strict mode
2016-05-19 21:01:52 +02:00
Laurent Destailleur
b82eabe25f
Code comment
2016-05-19 18:52:12 +02:00
Laurent Destailleur
e7072185ab
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/comm/propal.php
2016-05-18 20:47:57 +02:00
Laurent Destailleur
49c2549400
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/propal.php
2016-05-18 20:40:09 +02:00
Laurent Destailleur
4e46a01d51
Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED
2016-05-17 22:59:46 +02:00
Laurent Destailleur
89d37ccc62
Fix translation
2016-05-17 21:55:39 +02:00
Laurent Destailleur
7bbb3a7da1
Supplier proposal was missing
2016-05-17 19:34:23 +02:00
Laurent Destailleur
7063b26018
Debug 4.0
2016-05-17 19:32:19 +02:00
Laurent Destailleur
e2d3f4e27d
Supplier proposal was missing
2016-05-17 19:15:44 +02:00
Laurent Destailleur
d083ad9382
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/product/class/product.class.php
htdocs/resource/class/html.formresource.class.php
2016-05-17 18:21:22 +02:00
Laurent Destailleur
79be93d998
FIX The table llx_product_lot is now filled/used to store eatby/sellby
...
dates.
2016-05-17 18:19:36 +02:00
Laurent Destailleur
0e040b166d
Fix: When we edit a product to use lot/serial number, we initialize
...
records for unknown lots to generic value 'Undefined'.
2016-05-17 17:55:41 +02:00
Laurent Destailleur
3b99fb01ee
Fix duplicate table
2016-05-17 10:51:03 +02:00
Laurent Destailleur
f9ded46a99
Start debug 4.0
2016-05-17 02:41:06 +02:00
Laurent Destailleur
901c7c9517
Link "Backtolist" was missing on products
2016-05-17 02:16:28 +02:00
Laurent Destailleur
1973f67d41
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-05-17 01:11:14 +02:00
Laurent Destailleur
95ea20eb44
Clean code for stock movement when lot are used. We should not get
...
duplicate records into llx_product_batch
2016-05-17 01:10:11 +02:00
Laurent Destailleur
20a2e9394d
Fix typo comment
2016-05-16 22:44:11 +02:00
Alexis Algoud
8d0e5479a0
Rename var
2016-05-14 19:22:27 +02:00
Alexis Algoud
e74e70287f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/replenish.php
2016-05-14 19:14:39 +02:00
Laurent Destailleur
cba0ef5693
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2016-05-14 00:44:38 +02:00
Laurent Destailleur
6a0f16e9aa
FIX #5189
2016-05-13 20:39:31 +02:00
Laurent Destailleur
2b6029f5d3
FIX Some fix on stock. Condition to view warehouse as column and
...
protection against infinite loop
2016-05-12 19:44:49 +02:00
Florian HENRY
4cbab1cf47
FIX PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH
2016-05-12 16:58:14 +02:00
Laurent Destailleur
c8d98dbfdc
FIX error reported by scrutinizer
2016-05-08 11:33:46 +02:00
phf
0d03360375
Fix no confirm window if we delete buying price
2016-05-06 09:24:10 +02:00
Laurent Destailleur
10c7b167ea
Merge pull request #5115 from fappels/develop-new-warehouse-only-internal-status
...
NEW prepare for additional warehouse statuses
2016-05-05 21:27:47 +02:00
Laurent Destailleur
9c00c7ff97
Merge pull request #5105 from atm-alexis/develop_NEW_details_per_warehouse_into_reassort
...
NEW show detail per warehouse into reassort
2016-05-05 21:11:10 +02:00
Laurent Destailleur
b4e5acbaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/product/class/product.class.php
2016-05-04 14:43:40 +02:00
Laurent Destailleur
568a43214d
Add code comment
2016-05-04 13:51:47 +02:00
Laurent Destailleur
911e862a8e
Fix missing translation and add a TODO to avoid infinite loop.
2016-05-04 13:49:05 +02:00
Laurent Destailleur
7998cefdd2
Fix mark a deprecated function as deprecated
2016-05-04 13:15:00 +02:00
Alexis Algoud
c2f4f2fd9c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_details_per_warehouse_into_reassort
2016-05-02 09:38:42 +02:00
Laurent Destailleur
87231908df
Fix missing object constructor
2016-05-01 11:07:05 +02:00
Laurent Destailleur
f324c662c2
Better update of database cleaning non expected records.
2016-04-30 21:58:00 +02:00
Laurent Destailleur
50323afe94
Add comment
2016-04-30 21:33:18 +02:00
Laurent Destailleur
1bfc7e9b70
Merge pull request #5104 from fappels/patch-1
...
Update product.class.php
2016-04-30 00:28:22 +02:00
BENKE Charlie
49c3c69e30
minor error code
2016-04-29 20:20:47 +02:00
Laurent Destailleur
f5df6488db
Merge pull request #5094 from defrance/patch-2
...
minor error code
2016-04-29 20:18:55 +02:00
Laurent Destailleur
88842ccd8b
Merge pull request #5111 from nka11/api_improvement
...
Api improvement
2016-04-29 17:13:02 +02:00
Sergio Sanchis Climent
cd4e104b76
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
Conflicts:
htdocs/product/card.php
2016-04-29 12:39:00 +02:00
Juanjo Menent
9909143c42
Merge pull request #5076 from aspangaro/4.0-p21
...
FIX: For external api, don't use lengt_accountg without module accountancy activated
2016-04-29 11:55:55 +02:00
Laurent Destailleur
0419987b6f
NEW Add view of virtual stock into product list (when appropriate)
2016-04-28 15:22:38 +02:00
Sergio Sanchis Climent
32d641b66b
Bug show product if no accounting enabled
2016-04-28 11:12:04 +02:00
Laurent Destailleur
608c93702d
FIX Can't create a stock transfer from product card
2016-04-28 11:05:34 +02:00
Laurent Destailleur
e723966583
FIX: Qty in stock must be float like it is in stock movement.
...
FIX: Can't create a stock transfer from product card
Performance enhancement of stock information loading.
2016-04-28 11:01:56 +02:00
nka11
932b9837fe
Merge branch 'fix_5053' into api_improvement
2016-04-28 08:31:10 +02:00
fappels
65ea83fa06
NEW prepare for additional warehouse statuses
...
Add additional warehouse statuses, so you can add extra filter
possibility. For example hide warehouses with damaged stock from
shipping. Feature is still hidden by conf ENTREPOT_EXTRA_STATUS
Still TODO: config all $formproduct->selectWarehouses
2016-04-27 16:51:51 +02:00
Laurent Destailleur
39bc4d5f02
Optimize load_stock and load_stock_virtual
2016-04-27 14:19:06 +02:00
Laurent Destailleur
c6371060d0
FIX Stock limit for alert added into list of available fields for stock
2016-04-27 14:05:35 +02:00
Laurent Destailleur
810a6c2cb4
Better explanation
2016-04-27 13:39:54 +02:00
Laurent Destailleur
2beb16ef32
Remove limit on product ref on replenishment
2016-04-27 12:30:36 +02:00
nka11
98f757a87a
New API methods
...
add user to group
get product list by category id
2016-04-27 08:59:12 +02:00
Alexis Algoud
b46c14812c
Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop
2016-04-25 18:37:47 +02:00
Alexis Algoud
b472a244db
NEW decrease stock on expedition closing/classifying
2016-04-25 18:33:39 +02:00
Alexis Algoud
7658a86bc9
NEW show detail per warehouse into reassort
2016-04-25 15:34:54 +02:00
Francis Appels
11c31667b8
Update product.class.php
...
Fix updatePrice syslog.
Is travis still running phpunit tests?
2016-04-25 15:04:33 +02:00
BENKE Charlie
dde4f7ed85
minor error code
2016-04-24 02:01:29 +02:00
Laurent Destailleur
bcb4b2b607
Work on website module
2016-04-23 21:34:10 +02:00
Laurent Destailleur
b639849a47
Page for proposals must be called card.php (one of last architecture
...
change before the freeze)
2016-04-23 15:37:22 +02:00
aspangaro
a8aeba3ade
FIX: For external api, don't use lengt_accountg without module accountancy activated
2016-04-23 07:05:16 +02:00
Philippe-OpenDSI
2fc876f607
FIX #5048 Product supplier list display only one produc
...
Last parameter of select_produits_fournisseurs_list is $limit, not $socid
2016-04-21 08:41:45 +02:00
Laurent Destailleur
d347595d86
Merge pull request #5041 from aspangaro/4.0-p20
...
FIX: Accounting library already declared in line 54
2016-04-21 01:57:44 +02:00
Philippe-OpenDSI
e3e2b87506
Product supplier list display only one product
...
Last parameter of select_produits_fournisseurs_list is $limit, not $socidif
2016-04-21 01:55:35 +02:00
Laurent Destailleur
b032280d07
Merge pull request #5049 from philippe-opendsi/develop
...
FIX #5048 Product supplier list display only one product
2016-04-21 01:54:36 +02:00
Laurent Destailleur
1e5ff7388c
Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client
...
NEW Removed deprecated CommonObject::client property
2016-04-21 01:49:12 +02:00
Laurent Destailleur
30f7d4cd52
Merge pull request #5027 from marcosgdf/refactor-option
...
Refactored Form classes to use Form::selectarray instead of HTML code
2016-04-21 01:15:59 +02:00
Philippe-OpenDSI
c298b783ce
Product supplier list display only one product
...
Last parameter of select_produits_fournisseurs_list is $limit, not $socidif
2016-04-20 13:59:13 +02:00
aspangaro
bb554a73bd
FIX: Accounting library already declared in line 54
2016-04-19 06:18:34 +02:00
Laurent Destailleur
f68f5677bb
Start to use the vat code to identify a vat into combo list instead of
...
just "rate" and "npr".
2016-04-18 21:02:14 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Marcos García de La Fuente
863efcbc5d
NEW Removed unused FormOrder::selectSourcesCommande function
...
Also refactored select functions to avoid using HTML and encourage using Form::selectarray function
2016-04-16 21:33:23 +02:00
Laurent Destailleur
8d46d76f96
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/fourn/facture/card.php
htdocs/product/composition/card.php
2016-04-12 15:00:02 +02:00
Laurent Destailleur
d0e3d9db76
Merge pull request #4992 from altatof/fix_minimum_buying_price
...
FIX: correct display of minimum buying price
2016-04-11 19:17:09 +02:00
Christophe Battarel
292373cf84
forgot new discount field
2016-04-11 17:43:10 +02:00
Christophe Battarel
983b2c9a21
FIX: real min buying price
2016-04-11 17:40:47 +02:00
Laurent Destailleur
c2fc9ecf68
Fix scrutinizer warning
2016-04-09 16:12:53 +02:00
Laurent Destailleur
5b55af4d66
NEW Mutualize code: Use one call of function "addThumbs", when possible,
...
to generate thumbs files instead of several call of "vignette" function.
2016-04-09 14:12:21 +02:00
Laurent Destailleur
e869ed51e4
Use the update method to edit cost price of a product instead of
...
setValue that does not run triggers.
2016-04-09 10:41:39 +02:00
Laurent Destailleur
7b16482cee
Add comment to show directoves to solve conception error on lot
...
management (add a table to store all lots and their properties: date,
note, ...)
Removed deprecated field pmp at stock level (pmp is at product level)
2016-04-09 10:01:22 +02:00
Laurent Destailleur
3827a06796
Debug the supplier ref reputation feature.
2016-04-08 22:18:36 +02:00
Laurent Destailleur
448758bbf4
Merge branch 'develop_NEW_supplier_price_reputation' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_supplier_price_reputation
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-04-08 22:01:55 +02:00
Laurent Destailleur
f205b04b39
Merge pull request #4960 from defrance/patch-119
...
change comment
2016-04-08 21:32:55 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
39b61d6924
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/boxes/box_task.php
htdocs/core/lib/files.lib.php
2016-04-07 19:27:53 +02:00
BENKE Charlie
9484dc5b3e
change comment
2016-04-06 11:38:34 +02:00
Alexis Algoud
61a077b0ee
NEW reputation for price supplier
2016-04-06 09:58:03 +02:00
Laurent Destailleur
43165bab02
FIX Filter/search on extrafields on lists
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-04 16:22:26 +02:00
Laurent Destailleur
592a041bc5
FIX Filter/search on extrafields on lists
2016-04-04 16:02:29 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
Laurent Destailleur
c340745b78
FIX Option "showstock" was not effective into warehouse list
2016-04-01 11:05:15 +02:00
Laurent Destailleur
2a19326a3f
FIX Missing database escaping on supplier price insert/update
2016-03-31 21:47:32 +02:00
Laurent Destailleur
a36abd43fd
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-30 16:27:14 +02:00
Laurent Destailleur
07e622a7f8
Introduce () to have code cleaner
2016-03-30 14:04:22 +02:00
Marcos García de La Fuente
362bc106eb
FIX Multiprice generator didn't recalculate prices if only the price_base_type property changes
2016-03-30 11:40:57 +02:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2e9832c8d
Revert "Corrected non-static usages of Form::multiselectarray function"
...
This reverts commit 0a53cdd88f
2016-03-25 15:34:43 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
0a53cdd88f
Corrected non-static usages of Form::multiselectarray function
2016-03-20 14:15:18 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Laurent Destailleur
5eef373ed6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/user/card.php
2016-03-18 14:56:44 +01:00
Laurent Destailleur
fb625f0ca7
FIX #4812
2016-03-18 13:58:06 +01:00
Laurent Destailleur
2b1f57f01e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
2016-03-18 11:54:14 +01:00
Laurent Destailleur
7fa71214bc
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
2016-03-18 11:06:41 +01:00
Laurent Destailleur
e5f0027dbf
Merge pull request #4823 from ndrosis/3.9
...
FIX SQL syntax error in export
2016-03-17 23:37:23 +01:00
Laurent Destailleur
22f6e0e92d
Merge pull request #4831 from fmarcet/3.9
...
FIX: Not showing sellprice properly on product list
2016-03-17 23:33:05 +01:00
Alexis Algoud
19e3c1b089
FIX finished parameters not used
2016-03-17 16:35:23 +01:00
philippe grand
d434cee3fa
[Qual] Typo
2016-03-17 09:40:05 +01:00
fmarcet
a1bc5dcc31
FIX: Not showing sellprice properly on product list
2016-03-16 16:35:07 +01:00
fmarcet
ad942afbf1
FIX: Not showing sellprice properly on product list
2016-03-16 16:30:59 +01:00
Drosis Nikos
610249068d
Fix syntax
...
SQL error when ordering product list
2016-03-15 12:48:46 +02:00
Laurent Destailleur
619ebf9a3e
Enhance css of search fields
2016-03-13 20:38:16 +01:00
Laurent Destailleur
2e1a63a1f3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/langs/de_DE/companies.lang
htdocs/langs/fr_FR/compta.lang
htdocs/societe/class/societe.class.php
htdocs/societe/commerciaux.php
htdocs/societe/consumption.php
2016-03-10 15:09:30 +01:00
Laurent Destailleur
3b035819a9
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
htdocs/product/document.php
htdocs/societe/commerciaux.php
2016-03-10 15:03:53 +01:00
Laurent Destailleur
d6f3a5c046
Fix bad path
2016-03-10 15:01:39 +01:00
Marcos García de La Fuente
d43d0bfec1
Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation
2016-03-08 12:16:32 +01:00
Florian HENRY
a8e2b49c5b
FIX : #4768
2016-03-08 10:22:31 +01:00
Ion Agorria
2bca2b278a
Fix parser and button not using selected expression
2016-03-04 13:03:07 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
Marcos García de La Fuente
aa45734683
FIX #4434 Weird behaviour when enabling multiprices
...
Close #4434
2016-03-02 11:38:40 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
997fd5ba5d
Fix do not show no price because e already have default
2016-02-27 11:59:51 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Laurent Destailleur
c1ea597cb7
Redesign page with customer price to make it easier to understand.
2016-02-26 13:44:03 +01:00
Laurent Destailleur
9e8fcd19aa
Fix PHPCS
2016-02-24 17:05:34 +01:00
Laurent Destailleur
0f6e88b460
Update css of warehouse list
2016-02-24 12:18:24 +01:00
Laurent Destailleur
09951888a5
Can select number of records for warehouse lists.
2016-02-23 23:04:17 +01:00
Laurent Destailleur
28b8258acb
Fix in most cases, we don't need translated value of languages, jsut
...
list of language code.
Fix cost price was not updated.
2016-02-23 19:50:33 +01:00
Laurent Destailleur
f6d1913bb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
2a6009096d
Add hidden option PRODUCT_DISABLE_LENGTH and PRODUCT_DISABLE_SURFACE
2016-02-22 13:11:46 +01:00
Laurent Destailleur
c1d7f5a7ed
FIX #4633
2016-02-21 20:00:40 +01:00
Ion Agorria
9fc7041a28
Use error_parser instead of reserved error var
2016-02-20 19:47:17 +01:00
Ion Agorria
c84e74c081
Fix dynamic price parsing in fournisseurs.php
2016-02-20 19:37:11 +01:00
Laurent Destailleur
d3960b0809
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/member.lib.php
htdocs/expedition/card.php
2016-02-20 04:25:39 +01:00
Laurent Destailleur
a2817049c9
Fix must show warning only if threshold defined.
2016-02-20 03:34:56 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
3864bd35c9
Fix NPR Vat is working correctly with multiprice too
2016-02-19 03:59:43 +01:00
Laurent Destailleur
4d0b9946f5
FIX Maxi serious problem when updating prices and vat of a product. All
...
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
2016-02-19 02:41:00 +01:00
Laurent Destailleur
52c82508e4
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/charges/index.php
2016-02-18 23:27:57 +01:00
Laurent Destailleur
b0b2668428
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-18 23:21:22 +01:00
Laurent Destailleur
bc4c964b89
Several fixes in stock management (label, and bad action when lot module
...
is on)
2016-02-18 23:21:02 +01:00
Raphaël Doursenaud
dfe7c6f06f
Fix #4649 Wrong parameters order
2016-02-18 12:21:11 +01:00
Laurent Destailleur
633de3bcb4
Fix list of object referers should not be set to invoice by default (may
...
be module is disabed). I replace with a message to choose list.
2016-02-17 22:33:02 +01:00
Laurent Destailleur
e0a0817123
Merge pull request #4623 from IonAgorria/dynamic-price-changes
...
Dynamic price corretions/changes
2016-02-16 15:11:02 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
b7ae5bac6f
Fix: The text "All" is not appropriate.
2016-02-14 20:48:25 +01:00
Ion Agorria
0e2be880c5
Convert null to string
2016-02-14 19:05:43 +01:00
Ion Agorria
89657d0439
Changed Price Parser functions and added testExpression
2016-02-14 17:28:31 +01:00
Ion Agorria
6bfc3f446f
Use setSupplierPriceExpression instead of product setPriceExpression
2016-02-14 16:35:23 +01:00
Ion Agorria
b1568a7319
Better Add buttons in dynamicprice module
2016-02-14 16:35:17 +01:00
Ion Agorria
99efbd3464
Check if dynamic price is enabled
2016-02-14 16:09:47 +01:00
Laurent Destailleur
04114a5e1e
Provide a better explanation on how the module dynamic price works
2016-02-13 03:11:27 +01:00
gauthier
756b50b9d3
FIX : search product in customer product prices doesn't work
2016-02-12 12:06:23 +01:00
Laurent Destailleur
6662c1b5e1
NEW Can select dynamicaly number of lines to show on page on product,
...
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
2016-02-10 23:37:34 +01:00
Laurent Destailleur
5ea9c6dd83
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/accountancy.lang
2016-02-09 14:40:25 +01:00
Laurent Destailleur
404663472a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-02-08 15:50:34 +01:00
Laurent Destailleur
0b6bd0bc14
More robust error management on barcode module.
2016-02-08 15:49:38 +01:00
Sof
19b333f78b
FIX : Typo
2016-02-08 14:48:05 +01:00
Laurent Destailleur
b5ca02fddf
Merge pull request #4576 from mrsof/patch-5
...
TYPO : Syntax error in golbal var
2016-02-08 14:46:57 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
Sof
0cee4b016b
FIX : Typo
2016-02-05 19:46:01 +01:00
Laurent Destailleur
062deae24c
Merge
2016-02-05 12:18:50 +01:00
BENKE Charlie
0517435797
add product document generation
2016-02-04 16:21:27 +01:00
BENKE Charlie
db0c8740b9
add administration feature of products docs
2016-02-04 16:17:45 +01:00
Francis Appels
5f7cb75518
Fix #4556 desiredstock and seuil_stock_alerte cleared on modify product card
...
removed inputs from update form also removed from update action
2016-02-03 19:52:09 +01:00
Laurent Destailleur
47e2e33fb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
165771b652
FIX #4439
2016-02-03 01:46:30 +01:00
Laurent Destailleur
bbf15d6a5d
FIX #4498
2016-02-03 01:20:06 +01:00
Laurent Destailleur
e3a4124a58
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/fr_FR/bills.lang
2016-01-30 16:13:06 +01:00
Laurent Destailleur
5e9fd25a6e
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-30 15:59:40 +01:00
Laurent Destailleur
dfd4d36bdf
Merge remote-tracking branch 'origin/3.7' into 3.8
2016-01-30 15:58:11 +01:00
Laurent Destailleur
c9661ee20e
Merge remote-tracking branch 'origin/3.6' into 3.7
2016-01-30 15:57:09 +01:00
Laurent Destailleur
6e69e99227
FIX VAT Rate was not visible in log of old price list
2016-01-30 15:34:06 +01:00
Laurent Destailleur
83b297a9b2
FIX VAT Rate was not visible in log of old price list
2016-01-30 15:33:11 +01:00
fmarcet
e3d8a9a8a4
FIX: Doesn't collect the value of the cost price correctly
2016-01-27 12:13:31 +01:00
fmarcet
eec8d30625
FIX: Not returning the correct multilevel price
2016-01-27 10:57:04 +01:00
Marcos García de La Fuente
83263e242e
Corrected typo of PR #4444
2016-01-23 20:32:22 +01:00
Laurent Destailleur
4df584e57b
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/fourn/commande/card.php
2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5
Merge remote-tracking branch 'origin/3.6' into 3.7
2016-01-23 11:32:06 +01:00
Laurent Destailleur
d2f5f5c01f
Merge pull request #4266 from fappels/develop_multi_warehouse
...
Add shipping and dispatching from/to multiple warehouses
2016-01-22 02:26:25 +01:00
Marcos García de La Fuente
da637db162
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
2016-01-18 10:17:59 +01:00
Laurent Destailleur
7b14b5e115
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2016-01-14 13:30:27 +01:00
Laurent Destailleur
7b4ebb498e
Merge pull request #4415 from fappels/3.9-4409
...
Fix #4409 totals not shown in stock/list
2016-01-14 11:07:47 +01:00
fappels
f264b5e451
Revert changes stock/list, moved to PR #4415
2016-01-13 16:43:34 +01:00
fappels
284722ef3c
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
2016-01-13 16:41:34 +01:00
fappels
f150676908
Fix #4409 totals not shown in stock/list
2016-01-13 16:33:51 +01:00
Laurent Destailleur
d396612a7c
NEW: Add a new method for margin calculation. Added margin on "cost
...
price" to margin on WAP price and margin on "best supplier price".
2016-01-13 12:48:59 +01:00
Laurent Destailleur
381eea0dbf
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-01-12 23:10:25 +01:00
Laurent Destailleur
d7fdcc83bb
Fix missing search criteria
2016-01-12 22:03:19 +01:00
fappels
51b08f579b
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
...
Fix Conflicts:
2016-01-12 13:56:00 +01:00
Laurent Destailleur
6648ef0064
Fix missing include
2016-01-10 12:37:56 +01:00
Laurent Destailleur
cc4c5873e6
Fix sql error
2016-01-10 12:37:48 +01:00
Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Juanjo Menent
2bb2f22955
Merge pull request #4252 from aspangaro/develop-a4
...
Accountancy Add a list to select accounting account on product card
2016-01-09 17:41:43 +01:00
Laurent Destailleur
37c106acff
Fix search on shipment
2016-01-08 23:59:02 +01:00
Laurent Destailleur
99f3870ee6
Fix no picot if no warehouse set
...
Fix search on warehouse
2016-01-08 23:54:40 +01:00
Laurent Destailleur
96e5651ed5
Fix missing field on list. Restor ability to search on supplier ref.
2016-01-03 14:38:47 +01:00
Laurent Destailleur
52cd5d505e
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
Laurent Destailleur
ed3f0ce86b
Fix totalnboflines not correctly managed
2015-12-28 00:20:48 +01:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Laurent Destailleur
97030b05ce
FIX #4281
2015-12-27 18:20:39 +01:00
Juanjo Menent
cdd1641b66
Merge pull request #4284 from frederic34/patch-7
...
typo
2015-12-24 15:50:24 +01:00
Frédéric FRANCE
45b60c7800
typo
2015-12-24 00:01:05 +01:00
philippe grand
1eeee203d7
[Qual] comments should be in english
2015-12-22 09:37:27 +01:00
aspangaro
07b42f2bd5
Fix bug with empty code - return -1
2015-12-22 07:31:59 +01:00
aspangaro
61208537d8
Merge remote-tracking branch 'Upstream/develop' into develop-a4
2015-12-22 07:13:56 +01:00
Laurent Destailleur
ad5f65e988
Fix: use the mini image on tooltip of thirdparties
2015-12-21 17:32:57 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
0a515ca8c0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-12-21 12:38:23 +01:00
Laurent Destailleur
7e03aaee23
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-21 12:25:47 +01:00
Laurent Destailleur
96b6f0d8fb
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
composer.json
htdocs/product/ajax/products.php
htdocs/product/class/product.class.php
2015-12-21 12:24:24 +01:00
Laurent Destailleur
f243b5230f
Fix search filter disappear and clean filter button not visible.
2015-12-20 20:24:12 +01:00
Laurent Destailleur
1c1d176715
Fix statistics was reporting bad value
2015-12-19 19:39:42 +01:00
Laurent Destailleur
9334cf8fd1
FIX #4243 sql injection
2015-12-19 18:03:08 +01:00
Laurent Destailleur
3b2a921378
Fix a serial is required for stock change
2015-12-19 14:05:38 +01:00
aspangaro
51640c19bb
Merge remote-tracking branch 'Upstream/develop' into develop-a4
...
Conflicts:
htdocs/product/card.php
2015-12-19 05:43:22 +01:00
fappels
bce7f52f79
merge Dolibarr/develop
2015-12-18 20:05:14 +01:00
fappels
7fc8007571
New add shipping and dispatching from/to multiple warehouses
...
Add select2 to warehouse selectors
Ship customer orderline from multiple warehouses
Dispatch client orderline to multiple warehouses
2015-12-18 18:00:31 +01:00
Laurent Destailleur
dc8e5f45ae
Merge pull request #4254 from grandoc/develop
...
[Qual] Uniformize code
2015-12-18 17:13:22 +01:00
Laurent Destailleur
5eea1ce7d9
Fix several warnings
2015-12-17 19:37:24 +01:00
philippe grand
c9d6607b04
[Qual] Uniformize code
2015-12-17 14:14:44 +01:00
aspangaro
85f87d45df
Add select account in product card
2015-12-17 12:57:08 +01:00
Raphaël Doursenaud
c2642acdba
Fix CI build 578 (Syntax error)
...
empty() only supports variables in PHP < 5.5
2015-12-17 10:03:42 +01:00
aspangaro
c34e698d59
Merge remote-tracking branch 'Upstream/develop' into develop-a4
2015-12-17 06:17:32 +01:00
aspangaro
b064d1106b
Accountancy Add a list to select accounting account on product card
2015-12-17 06:16:29 +01:00
Laurent Destailleur
9973315a07
Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
...
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Laurent Destailleur
6133298e58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-16 19:27:23 +01:00
Laurent Destailleur
f87ccc97e2
Miscellaneous fixes
2015-12-16 19:26:50 +01:00
Laurent Destailleur
33ea5c83b7
Merge pull request #4238 from fappels/develop
...
Fix product list page offset calculation
2015-12-16 19:26:32 +01:00
Laurent Destailleur
cd70b296c1
Merge pull request #4223 from fappels/develop-shipment-error-handling
...
Fix not complete output of error messages in shipment
2015-12-16 19:09:35 +01:00
Laurent Destailleur
d95be87e64
Merge pull request #4222 from grandoc/develop
...
Fix not complete output of error messages
2015-12-16 19:08:06 +01:00
Francis Appels
3568b889bf
Update list.php
...
Fix page offset calculation
2015-12-16 15:42:24 +01:00
fappels
9fa742ceb2
[QUAL] Shipment error handling
2015-12-14 21:38:26 +01:00
philippe grand
0fe64c6091
[Qual] Uniformize code
2015-12-14 20:54:55 +01:00
Frédéric FRANCE
af5bcc5312
Update mouvement.php
2015-12-14 09:31:40 +01:00
Laurent Destailleur
da8e38b253
Merge pull request #4213 from grandoc/develop
...
[Qual] Uniformize code
2015-12-13 19:56:43 +01:00
Laurent Destailleur
b949468b75
Merge pull request #4210 from IonAgorria/pricesel-fix
...
Price expression selector fix
2015-12-13 19:56:32 +01:00
Laurent Destailleur
e37fc87cd5
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 17:34:06 +01:00
Laurent Destailleur
1978eebb69
Fix bad merge
2015-12-13 17:33:20 +01:00
Laurent Destailleur
ef13bd43b0
Fix bad merge
2015-12-13 17:27:55 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
philippe grand
de0a13ae8f
[Qual] Uniformize code
2015-12-12 10:59:02 +01:00
Ion Agorria
57102aefde
Price expression selector fix
2015-12-12 01:38:24 +01:00
philippe grand
2cd49043a6
[Qual] Close database handler should be after Footer
2015-12-11 19:37:12 +01:00
Laurent Destailleur
7f3531a04c
Enhance script to track duplicate translation string and use it to
...
remove around 50 duplicates.
2015-12-06 13:34:57 +01:00
fmarcet
eb98bd1e78
FIX: Not delete a product when have customer price
2015-12-03 14:02:26 +01:00
Laurent Destailleur
12702ee128
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/report.lib.php
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
Laurent Destailleur
7105fabb79
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:51:49 +01:00
ricardomm
eb504ffacc
minor fix accessing $db
2015-12-02 11:53:23 +01:00
Laurent Destailleur
de730c9762
NEW Introduce cost price on product.
2015-11-30 21:20:45 +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
c15c0f6fbb
Minor css fix
2015-11-21 15:31:27 +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
eba5832d3a
FIX #4049 PHP warning when trying to access a non-existing product/service
2015-11-21 10:58:58 +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
bf2af33b89
Merge pull request #4015 from ParisLiakos/develop
...
Add a trigger for product translation deletion
2015-11-21 00:19:40 +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
Laurent Destailleur
6dc6bab556
Support of 'small', 'mini' and '' image size everywhere.
2015-11-17 10:38:00 +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
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
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
778941b549
Merge pull request #3948 from marcosgdf/missing-changes
...
Missing changes of PR #3927
2015-11-13 02:29:56 +01:00
Marcos García de La Fuente
3c42df935d
Corrected HTML closing tag
2015-11-12 10:26:05 +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
Frédéric FRANCE
2799dbf45b
Update product.php
2015-11-10 23:02:54 +01:00
Marcos García de La Fuente
80ef746348
Reverted unwanted changes
2015-11-08 19:23:02 +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
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
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
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
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
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
75b4cb4727
NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2
2015-11-07 14:37:47 +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
45b4122a95
NEW #3767 Allow changing multiple prices of a product at once
2015-11-07 12:29:51 +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
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
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
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
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
Laurent Destailleur
0f358eea49
Fix path definition of thumbs with the new function
2015-11-06 01:56:56 +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
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
Christophe Battarel
f566b38296
FIX pmp
2015-11-05 15:29:51 +01:00
Christophe Battarel
fa088eb6cc
FIX bad calculation for stock value
2015-11-05 14:57:58 +01:00
Marcos García de La Fuente
e64057c276
Removed unnecesary attribute
2015-11-05 13:07:44 +01:00
Marcos García de La Fuente
6e8a6eca7a
Fixed feature malfunction caused by commit a161e6d47a and previous changes
2015-11-05 13:06:14 +01:00
philippe grand
b9c0cd316f
[Qual] Fix : TODO:translate
2015-11-05 11:11:51 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
d8796e4cc7
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/product/stats/commande.php
htdocs/product/stats/commande_fournisseur.php
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
htdocs/product/stats/propal.php
2015-11-02 19:25:51 +01:00
Laurent Destailleur
2dab183240
Merge pull request #3858 from fappels/3.8
...
Fix always first warehouse in stock list lotserial
2015-11-02 17:59:33 +01:00
Laurent Destailleur
f928062e2b
FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO
2015-11-02 17:56:32 +01:00
fappels
d714d32424
Fix always first warehouse in reassortlot
2015-11-02 16:37:51 +01:00
Laurent Destailleur
1ee9594e38
Merge pull request #3846 from frederic34/patch-21
...
Correction double translation which give bad html display
2015-11-02 11:29:04 +01:00
Laurent Destailleur
72915aa16d
Merge pull request #3784 from All-3kcis/develop-patch-11
...
NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"
2015-11-02 11:23:49 +01:00
Laurent Destailleur
a161e6d47a
Continue debug of PRODUIT_MULTIPRICES option.
...
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
2015-11-02 10:09:09 +01:00
Marcos García de La Fuente
e1f2efee4d
Merge branch 'develop' into multiprice-generator
...
# Conflicts:
# htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-31 11:46:14 +01:00
Frédéric FRANCE
6e2d4aebb1
Update list.php
2015-10-31 11:27:50 +01:00
Maxime Kohlhaas
c46f9350a5
Fix : stats were wrong if same product on several lines with same quantity because of distinct
2015-10-30 09:50:04 +01:00
Laurent Destailleur
3760f247a2
NEW Can now select fields to show in product list. Extrafields are also
...
supported.
2015-10-30 00:05:00 +01:00
fmarcet
310ecb1e09
FIX: Show product image on getNomUrl()
2015-10-29 12:28:28 +01:00
fmarcet
6469a31a32
Style corrections
2015-10-29 10:38:21 +01:00
fmarcet
62dc6814a3
FIX #3726 Not showing images on product card
2015-10-29 10:14:54 +01:00
Laurent Destailleur
4042c6d5cc
Minor fixes
2015-10-28 23:02:02 +01:00
Laurent Destailleur
f5eaeb2fb5
Some minor fixes
2015-10-28 22:51:06 +01:00
Laurent Destailleur
8e1fd5c3ed
Uniformize labels and css style
2015-10-28 22:25:15 +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
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
Laurent Destailleur
531ef43a27
Some minor look fixes.
2015-10-22 19:13:16 +02:00
All-3kcis
ca8c1adf55
Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price()
2015-10-21 10:07:53 +02:00
Marcos García de La Fuente
c6baeacd3d
Removed JS debugging
2015-10-20 11:42:56 +02:00
Marcos García de La Fuente
1b10612c4b
Fixed PHPCS check
2015-10-20 11:41:33 +02:00
Marcos García de La Fuente
6db09a0d64
Little correction
2015-10-20 11:35:49 +02:00
Frédéric FRANCE
50fe3f6ee9
Update html.formproduct.class.php
2015-10-19 22:06:46 +02:00
Marcos García de La Fuente
e7e152c122
NEW Level multiprice generator based on per cent variations over base price
2015-10-19 15:13:19 +02:00
Laurent Destailleur
ccce974476
Fix #3766
2015-10-18 21:00:19 +02:00
Laurent Destailleur
2ad805912d
Fix #3765
2015-10-18 20:58:39 +02:00
Laurent Destailleur
fc1718c0d2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-10-18 20:57:39 +02:00
Laurent Destailleur
a0e30aa218
Fix #3764
2015-10-18 20:57:28 +02:00
Laurent Destailleur
4dc88406ac
Merge pull request #3737 from frederic34/patch-15
...
Bad chmod for directory when changing product ref
2015-10-18 20:28:17 +02:00
Marcos García de La Fuente
12de2d5947
NEW [ task #3768 ] Improve product multiprices view
...
Close #3768
2015-10-18 19:34:27 +02:00
philippe grand
1762b3aaa7
[Qual] Uniformize code
2015-10-17 17:09:34 +02:00
Laurent Destailleur
0211ad64ee
FIX Total in summary was not same than into detail on the referrer page.
...
Conflicts:
htdocs/product/stats/facture.php
2015-10-17 12:36:51 +02:00
Laurent Destailleur
2f46683526
FIX Total in summary was not same than into detail on the referrer page.
2015-10-17 12:28:47 +02:00
Laurent Destailleur
3d94e3d80e
FIX Editing a supplier price should keep the vat.
2015-10-17 12:01:17 +02:00
Laurent Destailleur
4eb7e023ed
Merge pull request #3752 from All-3kcis/develop-patch-9
...
Correct hook param name
2015-10-17 11:18:47 +02:00
Laurent Destailleur
7fd6d8839a
Uniformize code and use a new generic search architecture
2015-10-17 01:40:46 +02:00
Laurent Destailleur
2122d4d43a
NEW Contract module can be used to follow both sold and bought
...
contracts/recurring subscriptions.
2015-10-17 00:52:35 +02:00
Laurent Destailleur
537a13e2f4
NEW Show which fields are used for search when doing a generic search
...
from the quick search form.
2015-10-17 00:14:36 +02:00
Laurent Destailleur
d1d6c72d7d
NEW Uniformize way of working for search filters. One filter per object.
2015-10-16 22:21:26 +02:00
All-3kcis
ccf144dbae
Correct hook param name
...
$object => $product
2015-10-16 16:15:51 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/product/index.php
2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
2015-10-16 09:52:38 +02:00
Raphaël Doursenaud
6c2b46f939
Fix #3728 Properly remove last category
2015-10-15 10:15:37 +02:00
Laurent Destailleur
7f75a3da9d
NEW On list of thirdparties, user can select fields to show.
...
Make phpunit test working again localy.
Add missing columns into llx_expedition.
2015-10-15 03:29:35 +02:00
Frédéric FRANCE
3638f17d75
Update product.class.php
2015-10-14 22:28:03 +02:00
Frédéric FRANCE
f4cbc81c97
Bad chmod for directory when changing ref
...
When changing product ref, the old document directory is renamed and chmod 0664 in place of 0775
2015-10-14 20:13:14 +02:00
Laurent Destailleur
e9aed15bed
Work on the feature to select which field to show
2015-10-14 18:48:03 +02:00
Alexis Algoud
0251728e28
FIX double db escape add too quote
2015-10-12 17:36:24 +02:00
Laurent Destailleur
3f8e9bd181
Remove warning
2015-10-10 19:24:31 +02:00
Laurent Destailleur
a1d37f92cb
Several fix in CSS
2015-10-09 20:00:43 +02:00
Laurent Destailleur
61d739635e
Uniformize code and css for tables. Filters must be implemented
...
following example in test_arrays.php.
2015-10-09 12:30:16 +02:00
philippe grand
0e343ae3b2
syntax error
2015-10-08 09:34:02 +02:00
Laurent Destailleur
c460873c85
FIX The filter on thirdparty prices should be visible if there is at
...
least one thirdparty price.
2015-10-06 17:13:35 +02:00
Laurent Destailleur
d4a85d9fba
Fix missing css
2015-10-06 16:12:09 +02:00
frederic34
1e8ff69267
Optioncss
2015-10-04 13:34:55 +02:00
frederic34
9a021e6de4
Optioncss not kept in list
2015-10-04 10:45:57 +02:00
Laurent Destailleur
c0c0cc2415
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/interventions.lang
htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Laurent Destailleur
43f09dfccf
Work on theme
2015-10-02 16:26:08 +02:00
Laurent Destailleur
17a5b0a0f4
Fix css
2015-10-02 11:58:19 +02:00
Raphaël Doursenaud
f0466ba313
FIX #3607 Better categories setting and unsetting
...
This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.
2015-09-30 18:47:02 +02:00
Laurent Destailleur
3f506552e3
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/theme/md_exp/style.css.php
2015-09-27 21:29:16 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
6999ad0a4f
Merge pull request #3587 from GPCsolutions/fiche_titre
...
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Laurent Destailleur
3ee5920947
Merge pull request #3571 from fmarcet/3.8
...
FIX: When filter with empty status, by default get canceled status (-1)
2015-09-24 18:40:06 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529
[Qual] Replaced deprecated print_titre()
2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Florian HENRY
84fa92045c
FIX : avoid SQL error when no sortfield send to method
2015-09-23 12:10:38 +02:00
fmarcet
3ff8b3e437
FIX: Error retrieving customer prices
2015-09-23 10:23:29 +02:00
Juanjo Menent
339b558b6b
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-13 00:31:21 +02:00
Juanjo Menent
ba3d8f445c
Fix #3514 More elegant
2015-09-13 00:25:32 +02:00
Juanjo Menent
744e5375d2
Fix #3514 Bug: Error when trying to add a product to a non-existing object
2015-09-13 00:09:32 +02:00
Laurent Destailleur
94723a9b83
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/langs/en_US/accountancy.lang
2015-09-12 15:23:02 +02:00
Laurent Destailleur
db1d9d6d8e
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/fourn/commande/dispatch.php
2015-09-12 11:50:46 +02:00
Laurent Destailleur
0c3ebe63c2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/liste.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
2015-09-12 11:44:07 +02:00
Laurent Destailleur
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
Laurent Destailleur
5bc74ad6ea
Fix SQL injections #3300
2015-09-12 11:23:44 +02:00
Maxime Kohlhaas
c6081f0fa2
Fix multientity stock management (F.Henry followup)
2015-09-11 20:38:32 +02:00
Laurent Destailleur
7fd01d4aa3
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/paiement/cheque/class/remisecheque.class.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/list.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
2015-09-09 12:45:22 +02:00
Florian HENRY
89b723b2a7
FIX : multientity warehouse management
2015-09-08 16:23:00 +02:00
Florian HENRY
63a817c3a4
Fix wahrehouse multientty management
2015-09-08 16:13:15 +02:00
Florian HENRY
52cb9581ff
Fix multientity stock management
2015-09-08 16:00:13 +02:00
Laurent Destailleur
d108881690
Merge pull request #3370 from atm-gauthier/new_add_next_ref_on_product_service_clone
...
NEW : conf to use next product/service ref when we clone a product/se…
2015-09-05 10:57:11 +02:00
Frédéric FRANCE
132a464df6
Update product.php
2015-09-05 08:57:01 +02:00
Juanjo Menent
de3f1b5559
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-09-04 18:23:33 +02:00
Regis Houssin
1a08f65942
Fix: problem with pagination
2015-09-02 17:22:19 +02:00
Laurent Destailleur
03435d7d90
Fix bad error management
2015-09-01 12:36:43 +02:00
Laurent Destailleur
942723ff8d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-31 12:13:35 +02:00
Laurent Destailleur
31465fe899
Fix several minor bugs
2015-08-31 12:13:23 +02:00
Laurent Destailleur
3315978fd3
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-30 21:22:28 +02:00
fappels
b908f10c5b
Fix missing product label in package tab
2015-08-30 11:50:47 +02:00
Juanjo Menent
c09b130644
Merge pull request #3403 from defrance/patch-76
...
NEW add in get_origin function generic origintype
2015-08-28 16:28:59 +02:00
Juanjo Menent
4cd61073e2
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-26 20:26:27 +02:00
Laurent Destailleur
603c44c37c
Merge pull request #3405 from aspangaro/3.8-13
...
Fast review 3.8
2015-08-26 11:27:16 +02:00
aspangaro
73d8f20c6b
Fix: Correct directory where the donation is generated & add the action to remove_file who are generated
2015-08-25 08:09:14 +02:00
aspangaro
478947d630
Correct
2015-08-23 07:46:37 +02:00
aspangaro
7d2eae2359
Fix: Better presentation for add form
2015-08-23 07:37:38 +02:00
BENKE Charlie
af7302fa90
change done
2015-08-23 00:30:11 +02:00
BENKE Charlie
1b117d5581
add in get_origin function generic origintype
...
actually we have only internal module origintype
propose to add feature to add stockmovement from other external module
2015-08-21 14:10:55 +02:00
Laurent Destailleur
15ab9c0ecd
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/stock/mouvement.php
2015-08-20 16:08:42 +02:00
Laurent Destailleur
3bdd342df1
Fix #3116
2015-08-14 23:53:59 +02:00
Regis Houssin
fdf6c32fbc
Fix: place the form outside the table for avoid errors
2015-08-13 12:47:04 +02:00
Gauthier
dd2f699730
NEW : next ref on clone doesn't need conf, it's used if mask exists
2015-08-13 09:28:25 +02:00
Juanjo Menent
3d847ac894
Fix #3217 [Stocks] Warehouse list shows SQL request
2015-08-01 14:29:32 +02:00
Alexis Algoud
24ae5a0ca6
FIX virtual stock for virtual product
2015-07-24 11:37:15 +02:00
Gauthier
900c287de4
NEW : conf to use next product/service ref when we clone a product/service
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/admin.lang
htdocs/product/admin/product.php
2015-07-21 12:43:12 +02:00
Laurent Destailleur
d843b1fbe4
Fix: No html form tag inside a table tag. Must be out of table.
2015-07-20 13:03:12 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
aspangaro
d9dd9ff688
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-16 12:25:37 +02:00
Laurent Destailleur
49d4ff9b5b
Merge pull request #3191 from fappels/3.8
...
Fix #3120 Product Customer price not updated
2015-07-16 10:16:39 +02:00
aspangaro
8689b22e14
Product card: remove old code
2015-07-16 05:31:05 +02:00
aspangaro
f3c3bb708f
Move <br>
2015-07-16 05:06:46 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Francis Appels
b113e6c6bf
Fix #3120 Product Customer price not updated
...
Re inserted product fetch was removed in commit
e43d4a6239
2015-07-13 11:27:35 +02:00
Laurent Destailleur
a9289de616
Several fixes. Fix #2927
2015-07-13 11:22:18 +02:00
Laurent Destailleur
e31af7f914
Can filter list of setup constant on name and extend visibility to all.
2015-07-12 18:05:56 +02:00
Laurent Destailleur
11c94a9d3b
Clean code
2015-07-12 16:50:27 +02:00
Laurent Destailleur
1fb40565f4
Fix bad parameters of function select_date
2015-07-12 12:50:24 +02:00
Laurent Destailleur
276f057acf
Clean trigger codes
...
Better error message when we insert duplicate barcode.
2015-06-30 16:10:03 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
Laurent Destailleur
ae5b779652
Uniformize code
2015-06-30 01:34:17 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Laurent Destailleur
ce6039f7f6
NEW Replace category edition page on members with new select2 component.
2015-06-27 23:01:05 +02:00
Laurent Destailleur
b6efa5ed11
NEW Can upload files on leave requests. Use more standard permissions.
2015-06-27 11:45:23 +02:00
phf
582f9cd214
FIX : keep filter by category or by not enough stock if we switch page
2015-06-26 11:04:08 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Alexis Algoud
d0999e5458
FIX hide category if it's not enable
2015-06-19 14:30:23 +02:00
Laurent Destailleur
b3c1ebf30a
Debug price per customer
2015-06-19 12:13:05 +02:00
Laurent Destailleur
eac822d821
Merge pull request #3069 from aspangaro/develop-patch33
...
Fix: Accountancy - SQL error & typo
2015-06-19 11:23:43 +02:00
Laurent Destailleur
20da120a49
Merge tab to upload photo and other files to same tab. This reduce
...
duplicate code and avoid users to be lost.
2015-06-19 11:19:13 +02:00
aspangaro
fb57941b21
typo
2015-06-19 06:06:46 +02:00
Laurent Destailleur
b5cc7ae1c8
Work on merge tab photos and attached files
2015-06-19 00:52:58 +02:00
Laurent Destailleur
d8f86708b1
Minor look fix
2015-06-19 00:36:03 +02:00
Laurent Destailleur
bbc70004d9
Disable option that i can't understand.
2015-06-19 00:18:41 +02:00
Laurent Destailleur
425d9bff48
Tooltip to make understanding better.
2015-06-18 19:33:29 +02:00
Regis Houssin
9c6c3ad65d
Fix: wrong user right
2015-06-17 16:33:18 +02:00
Laurent Destailleur
ceb0d71f54
Merge pull request #3054 from hregis/3.7_photos
...
Fix: thumb "mini" not deleted
2015-06-16 11:38:39 +02:00
Laurent Destailleur
34468644ef
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-06-16 11:15:16 +02:00
Regis Houssin
5e25c69891
Fix: thumb "mini" not deleted
2015-06-16 09:28:31 +02:00
Marcos García de La Fuente
2d3ab3b658
Merge remote-tracking branch 'upstream/3.5' into bug-2814-2
...
Conflicts:
ChangeLog
2015-06-15 09:39:17 +02:00
Laurent Destailleur
87e07a3038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/virement.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/card.php
htdocs/societe/soc.php
2015-06-14 17:18:45 +02:00
Laurent Destailleur
a7cec18081
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/categories/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/upgrade2.php
htdocs/product/liste.php
2015-06-14 17:11:36 +02:00
Laurent Destailleur
f4da53c300
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
2015-06-14 17:04:24 +02:00
Laurent Destailleur
fadc640335
Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-2835
Conflicts:
ChangeLog
2015-06-14 16:07:19 +02:00
Marcos García de La Fuente
1215502927
Fix Close bug #2814 JPEG photos are not displayed in Product photos page
2015-06-13 03:11:17 +02:00
Juanjo Menent
567dece678
Merge pull request #3011 from GPCsolutions/3.7-3009
...
FIX #3009 : Better filtering to prevent SQL injection
2015-06-12 21:26:14 +02:00
Marcos García de La Fuente
f9574fa458
FIX Close #2835 Customer prices of a product shows incorrect history order
2015-06-12 19:05:08 +02:00
Marcos García de La Fuente
2051a66cd7
FIX Close #2837 Product list table column header does not match column body
2015-06-12 18:46:05 +02:00
Laurent Destailleur
4e5ed08ff8
Clean code
2015-06-12 13:21:21 +02:00
fmarcet
5783c185bd
Fix: Not reading external barcode numeration module
2015-06-11 10:43:12 +02:00
Raphaël Doursenaud
4ee6c1810e
FIX #3009 : Better filtering to prevent SQL injection
2015-06-11 10:38:29 +02:00
Raphaël Doursenaud
d89955047b
FIX #3009 : Better filtering to prevent SQL injection
2015-06-11 10:37:30 +02:00
Juanjo Menent
49b369035a
Merge pull request #3002 from hregis/develop_productprice
...
NEW: add "productpricecard" hook and uniformize code
2015-06-10 21:13:01 +02:00
Regis Houssin
c21156dd13
Fix: strict mode hunter
2015-06-10 18:58:42 +02:00
Regis Houssin
e43d4a6239
NEW: add "productpricecard" hook and uniformize code
2015-06-10 18:42:16 +02:00
Laurent Destailleur
89f77f5e2b
Uniformize code
2015-06-06 14:21:18 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
a33241f487
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:46:30 +02:00
Laurent Destailleur
acd693b513
Fix phpcs
2015-06-01 21:37:09 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
523b04a315
Work on finishing
2015-05-31 17:31:15 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
phf
a676d3a0d1
Merge branch '3.6' into 3.7
2015-05-27 10:56:16 +02:00
phf
5a006d824e
FIX : top links menu have target attribute with wrong value
2015-05-27 10:52:23 +02:00
BENKE Charlie
d16bfcc294
adding hook for more action buttons
...
allow additionnal hook action (like myField)
2015-05-26 15:00:23 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Laurent Destailleur
a33809a526
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
2015-05-25 17:46:42 +02:00
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Laurent Destailleur
6108dfad55
Minor enhancement
2015-05-22 00:46:53 +02:00
maxime peyrot
bcb4754585
FIX #2856 : Wrong table design
2015-05-21 17:40:36 +02:00
Raphaël Doursenaud
a7f6bbd316
Properly escape untrusted data to prevent HTML injection.
...
First pass for #2857
2015-05-20 17:34:00 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Francis Appels
28e973331b
Fix: update supplier orderline + rm deprecated prop
...
- Fix SQL error in update supplier orderline
- Remove deprecated $libelle from product class, $libelle is removed
from code and can not be used anymore, no sense to mark deprecated.
- Add missing translation key
2015-05-18 18:42:14 +02:00
Florian HENRY
4bc2d55cb3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-15 17:37:31 +02:00
Laurent Destailleur
bf883e1576
Minor cosmetic changes
...
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
Laurent Destailleur
74607218ea
Fight against key tva_taux. Removed completely.
2015-05-14 15:59:09 +02:00
Laurent Destailleur
4408648a68
Merge pull request #2817 from GPCsolutions/jqueryfixes
...
jQuery fixes
2015-05-12 22:36:12 +02:00
Florian HENRY
8e61a03b5c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-12 21:02:36 +02:00
Laurent Destailleur
cb6f23d9b6
Merge pull request #2771 from aternatik/api_rest
...
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Raphaël Doursenaud
e149d49fb8
[Qual] Use jQuery property instead of attribute to test and set disabled
2015-05-12 14:53:01 +02:00
Laurent Destailleur
b2fa603f46
Merge pull request #2794 from hregis/develop_origin
...
Fix: add $object for use with triggers
2015-05-11 23:02:41 +02:00
Marcos García de La Fuente
f6616deef3
Removed debugging function
2015-05-10 01:28:40 +02:00
Marcos García de La Fuente
f8e8b39ff2
FIX #2758 Product::update sets product note to "null" when $prod->note is null
2015-05-10 01:27:28 +02:00
Juanjo Menent
e07cebd50b
Merge pull request #2793 from GPCsolutions/htmlfixes
...
HTML fixes
2015-05-09 13:58:43 +02:00
Juanjo Menent
c5101ae5ea
Code fixes
2015-05-07 20:07:47 +02:00
Raphaël Doursenaud
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
Regis Houssin
5578151bad
Fix: add $object for use with triggers
2015-05-07 12:08:02 +02:00
Regis Houssin
85244ba8c9
Fix: add $object for use with triggers
2015-05-07 12:06:17 +02:00
Regis Houssin
9a32d7ec2f
Fix: add $object for use with triggers
2015-05-07 12:02:24 +02:00
Laurent Destailleur
f197a94f59
Fix duplicate log
2015-05-07 10:52:41 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
jfefe
24bf614061
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-05-06 01:00:11 +02:00
jfefe
dbb9449ee7
Fix PHPCS
2015-05-06 00:55:42 +02:00
Laurent Destailleur
a4675010ac
Fix label
2015-05-05 22:08:53 +02:00
Juanjo Menent
f6d2320c34
Merge pull request #2756 from aternatik/fix_label_product
...
FIX : remove deprecated property 'libelle' on product object
2015-05-05 20:25:08 +02:00
Juanjo Menent
65d736cb68
Merge pull request #2766 from aternatik/fix_product_cat
...
Fix : missing link to category into product card.
2015-05-05 20:17:17 +02:00
jfefe
3b1f6e8a5a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
2015-05-05 12:56:10 +02:00
Laurent Destailleur
409e74facd
Missing translation
2015-05-05 11:10:13 +02:00
Laurent Destailleur
4d34f473f6
Won another space line
2015-05-05 11:07:28 +02:00
jfefe
3d8f692355
Fix : missing link to category into product card.
2015-05-05 01:34:50 +02:00
Laurent Destailleur
9b55bedf66
FIX bad calculation for stock value
2015-05-04 22:04:58 +02:00
Laurent Destailleur
c89c89c73e
Mutualise code and some fixes for stock management.
2015-05-04 22:02:54 +02:00
jfefe
a1cc47f81b
Missing rename product field libelle into label
2015-05-04 12:58:54 +02:00
jfefe
3a1b7d6530
Missing renaming fields
2015-05-04 12:37:50 +02:00
jfefe
561d5e82c1
Rename libelle product field into label
2015-05-04 12:33:38 +02:00
jfefe
7e0357dcf9
FIX : remove deprecated property 'libelle' on product object
2015-05-04 03:03:24 +02:00
jfefe
cd37d3eb11
Add API class for product
2015-05-04 01:17:41 +02:00
Laurent Destailleur
333a29683c
uniformize look
2015-05-03 21:15:08 +02:00
Laurent Destailleur
c485b1fe30
Fix When generation of doc is required and generator not provided, we
...
take first entry found.
2015-05-03 20:07:16 +02:00
Laurent Destailleur
f0b10c14d7
NEW Add a new component to select categories/tags from the main edit
...
page of product. The dedicated tab is also removed.
2015-05-03 15:51:55 +02:00
fmarcet
1c01e187c1
Fix: Bug in the new photo system
2015-04-27 17:20:10 +02:00
fmarcet
99c4508029
Fix: Bug in the new photo system
2015-04-27 16:44:12 +02:00
Laurent Destailleur
5b3b180c10
NEW Web service to create or update product can correct stock during
...
creation/update.
2015-04-27 01:36:13 +02:00
Laurent Destailleur
414404e854
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/class/commonobject.class.php
2015-04-26 16:30:33 +02:00
Francis Appels
93d9321088
FIX: can show print page after product save
...
Add product id to form action to be able show print page from product
card after save.
2015-04-22 23:27:09 +02:00
Frédéric FRANCE
768fdde2d1
Update product.class.php
2015-04-22 10:39:32 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
Marcos García de La Fuente
2967bc7df7
Merge branch 'develop' into units
2015-04-19 17:19:59 +02:00
Marcos García de La Fuente
7be7a770c1
Implemented units for CommandeFournisseur and FactureFournisseur
2015-04-19 16:46:24 +02:00
Florian HENRY
72c92557de
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/product/class/propalmergepdfproduct.class.php
2015-04-19 13:06:59 +02:00
Florian HENRY
37bc7c3f1d
typo
2015-04-19 13:05:40 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Laurent Destailleur
a091a24657
Fix phpcs
2015-04-19 01:52:15 +02:00
Marcos García de La Fuente
270bca740c
Merge branch 'develop' into units
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
2015-04-19 00:59:04 +02:00
Maxime Kohlhaas
0112cbaaf0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-04-19 00:28:15 +02:00
Marcos García de La Fuente
87f97ed545
Merge branch 'develop' into units
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/admin/product.php
htdocs/product/card.php
2015-04-18 23:38:14 +02:00
jfefe
25812f0071
Add picto for commercial pages titles
2015-04-18 23:17:44 +02:00
jfefe
3825b89ead
Change companies and product title picto
2015-04-18 23:13:48 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
Maxime Kohlhaas
bcf9e7fb37
Fix : use getentity for stock sharing
2015-04-18 23:08:21 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
c07e26dcac
Merge branch 'develop' into fr-2613
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Florian HENRY
62ef9743ea
Merge branch 'develop' into dev_pdfpropalmergeproductpdf
2015-04-18 19:16:33 +02:00
Florian HENRY
e15d4c045d
NEW : Propal merge product card PDF into azur
2015-04-18 18:44:05 +02:00
philippe grand
eaf0fda6aa
fix syntax errors
2015-04-18 18:07:41 +02:00
Maxime Kohlhaas
9d8036e5a7
New : categories as multi-select on product
2015-04-18 03:12:42 +02:00
Laurent Destailleur
193c080744
PHPCS
2015-04-12 19:20:48 +02:00
Laurent Destailleur
8ebad7a395
A serious rewrite of a lot of code to have the module batch number
...
stable.
2015-04-12 17:08:14 +02:00
Laurent Destailleur
6502d1c269
Fix: filter on stock too low forgot some lines
2015-04-12 15:22:34 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
d76c1a9f42
Can filter on serial number into movement list
2015-04-10 12:59:33 +02:00
Laurent Destailleur
aaef3a41c0
Short label into table
2015-04-08 19:33:06 +02:00
Laurent Destailleur
1bbecc0912
Restore link to stock for products.
2015-04-08 19:26:36 +02:00
Laurent Destailleur
b3355df3bf
Fix delivery delay could not be set to unknown
2015-04-08 13:00:03 +02:00
Laurent Destailleur
1efa5bcabd
Fix: Avoid duplicate tooltip
2015-04-08 12:44:11 +02:00
Laurent Destailleur
17fa1ce5b6
Fix #2552
2015-04-08 12:22:52 +02:00
Juanjo Menent
1f4a131691
Fix: Bad permission assignments for stock movements actions
...
Conflicts:
htdocs/product/stock/product.php
2015-04-07 20:43:27 +02:00
Juanjo Menent
d7ba9b3312
Fix: Bad permission assignments for stock movements actions
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/stock/mouvement.php
2015-04-07 20:40:48 +02:00
Juanjo Menent
9d8cb459f1
Fix: Bad permission assignments for stock movements actions
2015-04-07 20:28:45 +02:00
Laurent Destailleur
6fa0234409
Uniformize code
2015-04-07 03:00:11 +02:00
Scrutinizer Auto-Fixer
4da737424e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-06 10:25:30 +00:00
Marcos García de La Fuente
7075ac74c4
Merge branch 'develop' into units
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
Laurent Destailleur
9921eb8496
Fix error when upgating price
2015-04-02 19:41:19 +02:00
Laurent Destailleur
4241244345
Fix: class not defined
2015-04-02 17:35:07 +02:00
Laurent Destailleur
c62687d198
Comment
2015-04-02 12:55:00 +02:00
Laurent Destailleur
8e9c1c4747
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
Marcos García de La Fuente
831177ef99
Implemented constants for Product class
2015-03-30 03:14:07 +02:00
Laurent Destailleur
3cc4358e72
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/commande/liste.php
htdocs/product/stock/product.php
2015-03-29 15:24:17 +02:00
aspangaro
2b2b43afb6
Dir "Don"
2015-03-25 22:37:14 +01:00
Maxime Kohlhaas
b250c5588e
Fix : Quantity displayed for virtual stock explanations was wrong
2015-03-25 16:11:36 +01:00
Laurent Destailleur
3844d4e6f7
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/core/boxes/box_activity.php
htdocs/fourn/commande/card.php
htdocs/user/card.php
2015-03-23 15:16:37 +01:00
Laurent Destailleur
5d2e09ec51
Fix: navigation in page was wrong and typo errors.
2015-03-23 12:31:32 +01:00
Laurent Destailleur
55140afde4
Merge branch 'price-global-variables' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/dynamic_price/editor.php
2015-03-22 12:45:04 +01:00
Laurent Destailleur
a55af4387b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
2015-03-22 12:10:39 +01:00
Laurent Destailleur
c9b569ad1a
Fix calculation of PMP of product.
...
Also add phpunit test to avoid this in future.
2015-03-21 15:31:11 +01:00
Laurent Destailleur
4f9aef6150
Fix calculation of PMP of product.
...
Also add phpunit test to avoid this in future.
2015-03-21 15:29:23 +01:00
Scrutinizer Auto-Fixer
b693ed3f51
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-16 23:21:17 +00:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Ion Agorria
2c80b39937
Configuration page of dinamic prices and price global variables editor
2015-03-14 16:51:38 +01:00
Ion Agorria
9871aaed19
Price global variables and updaters classes
2015-03-14 16:50:46 +01:00
Ion Agorria
5f9b1fa029
Changes for applying new paths
2015-03-14 16:50:02 +01:00
Ion Agorria
fc5899174b
Relocation of expression files
2015-03-14 16:48:56 +01:00
Laurent Destailleur
10bbf463e7
Several bug fixes from scrutinizer
2015-03-14 14:55:41 +01:00
Laurent Destailleur
c45ec24958
Merge pull request #2379 from atm-maxime/develop
...
New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order
2015-03-14 14:08:38 +01:00
Laurent Destailleur
50b09fa8a9
Doxygen
2015-03-13 21:39:39 +01:00
Maxime Kohlhaas
ba0f19d116
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-03-12 17:12:34 +01:00
Laurent Destailleur
e8e2f65ae5
Debug virtual product interface
2015-03-11 14:55:45 +01:00
Maxime Kohlhaas
6f9fb6a282
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-03-10 15:18:08 +01:00
Laurent Destailleur
fc0be43f5f
Fix: beautify search box
2015-03-06 22:40:41 +01:00
Laurent Destailleur
a1567778ab
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/commande/card.php
2015-03-06 18:51:55 +01:00
Laurent Destailleur
a169b3348e
Fix show alays date fields for contract module.
...
Fix select of product were lost.
2015-03-06 14:36:22 +01:00
Laurent Destailleur
77dd07c846
Fix thumbs generation
2015-03-06 13:12:33 +01:00
Laurent Destailleur
96de912661
NEW: Add module "Supplier commercial proposals" to requests
...
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/tpl/document_actions_post_headers.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 17:54:43 +01:00
Laurent Destailleur
52425648bf
NEW: When using transfer or correct stock from warehouse, after
...
recording we go back to the warehouse page.
2015-03-04 01:54:26 +01:00
Laurent Destailleur
60a6d8789f
Merge remote-tracking branch 'origin/3.7' into develop
2015-03-04 01:14:27 +01:00
Laurent Destailleur
fa2e57eaa3
pcpcs
2015-03-04 01:10:23 +01:00
Laurent Destailleur
8a00109baf
Fix: Several bugs int replenishment feature.
2015-03-01 16:05:20 +01:00
Laurent Destailleur
560f1a43cd
Fix: Several bugs int replenishment feature.
2015-03-01 16:04:34 +01:00
Marcos García de La Fuente
b4c84fac9d
NEW: [ task #977 ] New option to manage product unit
...
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-03-01 12:42:38 +01:00
Laurent Destailleur
b888a04af9
Reduce a lot of duplicate code. Move all tables of extrafields setup
...
into a tpl file.
2015-02-28 20:14:26 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Laurent Destailleur
b9d3175897
Fix typo
2015-02-25 23:04:13 +01:00
Laurent Destailleur
89684748c5
Debug incdec option.
2015-02-24 19:55:59 +01:00
Laurent Destailleur
1c04af2e55
Merge branch 'feature_Product_stock_subproduct_stock_independent' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-feature_Product_stock_subproduct_stock_independent
Conflicts:
htdocs/langs/en_US/products.lang
2015-02-24 17:23:23 +01:00
Laurent Destailleur
562348eb34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
2015-02-24 15:42:28 +01:00
Laurent Destailleur
e55d3489aa
Little clean of feature several price per customers
2015-02-24 12:58:43 +01:00
Laurent Destailleur
0a5c3e1fa8
Fix price must be hidden if context is not on sell
2015-02-23 23:15:41 +01:00
Alexis Algoud
29e5b89352
erase some comments
2015-02-23 12:26:27 +01:00
Alexis Algoud
0c53121553
- use incdec into virtual product definition.
...
- improve screen of virtual product
2015-02-23 12:19:19 +01:00
Alexis Algoud
72908c1fd3
Merge branch 'develop' of https://github.com/atm-gauthier/dolibarr into feature_Product_stock_subproduct_stock_independent
2015-02-23 10:51:41 +01:00
Maxime Kohlhaas
2547d96ffd
New : Use supplier default payment terms when creating a replenish order
2015-02-20 09:26:53 +01:00
Maxime Kohlhaas
504cc89078
New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order
2015-02-20 09:24:33 +01:00
Laurent Destailleur
863094637e
Merge pull request #2333 from FHenry/develop_review_productstat
...
review product stats list and add filter by period
2015-02-18 22:23:33 +01:00
Gauthier
02d59cce5a
NEW : Product stock and subproduct stock are independant
2015-02-16 16:06:50 +01:00
Laurent Destailleur
e4e49e8a0b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/product/stock/product.php
2015-02-12 15:41:48 +01:00
Laurent Destailleur
206a453ce2
Solve confusion into number of order or qty into order.
2015-02-12 15:40:06 +01:00
Laurent Destailleur
c727e2b8ec
Fix bad translation
...
Conflicts:
htdocs/product/stock/product.php
2015-02-12 15:29:21 +01:00
Laurent Destailleur
6adfc6f6f4
Work on batch module. Add batch, eatby and sellby into movement table.
...
Clean language files for direct print module.
2015-02-12 15:23:31 +01:00
Laurent Destailleur
b49c8f84b6
Fix bad translation
2015-02-12 15:22:04 +01:00
Laurent Destailleur
78ba1fe86e
Fix bad null management
2015-02-12 00:01:31 +01:00
Laurent Destailleur
689354f927
New: A default label is suggested for stock correction and transfer
...
instead of empty string.
2015-02-11 23:54:42 +01:00
Laurent Destailleur
179cbbd187
Maxi debug and enhancement of module batch.
2015-02-11 22:54:06 +01:00
phf
34bc1dbc15
Merge branch 'develop' into new_ask_price
2015-02-09 09:07:50 +01:00
Florian HENRY
41b0b57743
review || GETPOST("button_removefilter")
2015-02-08 11:01:27 +01:00
Laurent Destailleur
1776349a30
Merge pull request #2329 from atm-ph/deliverytime
...
NEW Deliverytime
2015-02-08 00:00:50 +01:00
Florian HENRY
eea4815312
Display amount of line not total amount
2015-02-07 20:58:18 +01:00
Florian HENRY
9a7a5b9b20
review product stats list
2015-02-07 20:36:16 +01:00
Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
Laurent Destailleur
553181a5d9
Fixed: Location for file storage from tab attached files was not at same
...
place than from tab images.
2015-02-06 21:26:41 +01:00
phf
12c7e52b7e
[CORE] Fix : rename de la variable "delai_livraison_jours" en "delivery_time_days" (#deliverytime).
2015-02-06 16:33:58 +01:00
phf
35d41d6f7c
[CORE] Ajout d'un attribut (delai_livraison_jours) à l'objet ProductFournisseur, paramétrable lors d'un ajout/modification d'un prix fournisseur et s'affiche sur une commande fournisseur avec le plus grand délai parmis la liste des produits dans la commande (#deliverytime).
2015-02-06 16:07:22 +01:00
Laurent Destailleur
556c27f834
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/stock/mouvement.php
2015-02-04 15:15:50 +01:00
Frédéric FRANCE
0cb83c96b7
Can't use function return value in write context
...
Blank page on /htdocs/product/price.php
2015-02-02 16:23:25 +01:00
Laurent Destailleur
9c087e27d0
Fix permissions
2015-02-02 13:45:55 +01:00
Laurent Destailleur
eda2ff7f7b
Fix regression in phpunit
2015-02-02 13:37:19 +01:00
Laurent Destailleur
9285897759
Fix: Load priceparser only if required.
2015-02-01 15:08:56 +01:00
Laurent Destailleur
13019f1f33
Clean code introduced by last PR.
2015-01-31 17:02:36 +01:00
Laurent Destailleur
d66d4f53a5
Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into
...
frederic34-tooltip
Conflicts:
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/product/index.php
2015-01-31 15:41:33 +01:00
Laurent Destailleur
1c7feb67ea
Merge branch 'dinamic-prices-product' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/fournisseurs.php
2015-01-31 14:53:14 +01:00
phf
18cb313348
[CORE] ajout du nom du module dans $childtables pour le bon fonctionnement du module (#new_ask_price).
2015-01-30 16:54:50 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
Laurent Destailleur
43702cf662
New: Enhance stock management: Introduce tag to define if a subproduct
...
must have stock decreased and add inventory code on stock movements.
2015-01-30 01:51:28 +01:00
Laurent Destailleur
9850b753fa
Tooltip at wrong place.
2015-01-28 19:37:09 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Laurent Destailleur
b3e216b8f1
Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1787
Conflicts:
ChangeLog
htdocs/comm/propal.php
2015-01-18 15:06:54 +01:00
Marcos García de La Fuente
7f59cf9194
Fix: [ bug #1787 ] Incorrect behaviour of doActions hook
2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
85b1188593
Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php
2015-01-13 09:22:12 +01:00
Laurent Destailleur
e6d016cc48
Fixed: pmp update after makign a stock move.
2015-01-12 20:55:15 +01:00
Laurent Destailleur
31fd03790e
Fixed: Prices visible into stock tab.
...
Conflicts:
htdocs/product/stock/product.php
2015-01-12 18:26:11 +01:00
Laurent Destailleur
1d2c8bbd4d
Fixed: Prices visible into stock tab.
2015-01-12 18:16:24 +01:00
Laurent Destailleur
e24a668c52
Merge pull request #2225 from frederic34/psr2
...
Psr2
2015-01-09 22:53:06 +01:00
Laurent Destailleur
1cc4c8513e
Merge pull request #2224 from KreizIT/batch_transfert
...
Allow warehouse transfer for batched product
2015-01-09 22:46:40 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
frederic34
73fda2cb86
WIP PSR2
2015-01-08 18:36:03 +01:00
KreizIT
ce3a60b2a3
Allow warehouse transfer for batched product
2015-01-06 13:23:51 +01:00
KreizIT
a7fc2b3779
Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined'
2015-01-05 17:55:59 +01:00
Ion Agorria
5bbcb58b44
Added expressions for product/service prices
2014-12-28 01:26:41 +01:00
Juanjo Menent
a901329a7d
Fix: Bad order field value
2014-12-26 09:43:55 +01:00
Juanjo Menent
bdf5f5726f
Fix: Bad order field value
2014-12-26 09:29:27 +01:00
Juanjo Menent
d40229e9cc
Fix: Bad order field value
2014-12-26 09:14:19 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +01:00
Laurent Destailleur
d18770c1e7
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-12-26 04:16:08 +01:00
Marcos García de La Fuente
8e47fe9e1c
Fix: [ bug #1757 ] Sorting breaks product/service statistics
2014-12-26 00:19:09 +01:00
Marcos García de La Fuente
1f00794c98
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
2014-12-25 21:47:39 +01:00
Laurent Destailleur
a8c6417604
Merge remote-tracking branch 'origin/3.7' into develop
2014-12-15 10:33:14 +01:00
Laurent Destailleur
8e6d30589d
Fixed: Size too low
2014-12-14 20:51:28 +01:00
Laurent Destailleur
0b6ff8f9bc
Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not
...
be finished. We keep it as development status.
2014-12-14 20:41:11 +01:00
Laurent Destailleur
c6bb5904e7
Fixed: Cancel button not correctly supported
2014-12-14 16:01:25 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Laurent Destailleur
9be99b2987
Fixed: We must use PMP of product. Not warehouse.
2014-12-09 14:27:02 +01:00
Laurent Destailleur
6a70af2b67
Fixed: bug into produc batch management
2014-12-09 14:03:10 +01:00
Laurent Destailleur
a9338a0f9f
Fix: Maxi debug of module productbatch.
...
Conflicts:
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
2014-12-05 16:04:37 +01:00
Laurent Destailleur
5457d3116a
Fix: Maxi debug of module productbatch.
2014-12-05 16:01:01 +01:00
Laurent Destailleur
6729544782
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/projet/tasks/task.php
2014-12-04 14:52:34 +01:00
Laurent Destailleur
b5d74372de
Bad var
2014-12-04 01:36:53 +01:00
Laurent Destailleur
475d749a97
Fix: phpcheckstyle
2014-12-04 01:11:13 +01:00
Laurent Destailleur
1e8e4e7fda
Prepare 3.8 dev
...
Fix bad test.
Renamed table for dynamic prices.
2014-12-03 17:06:44 +01:00
Laurent Destailleur
1653384415
Merge branch 'dinamic-prices' of github.com:IonAgorria/dolibarr into IonAgorria-dinamic-prices
2014-12-03 13:14:35 +01:00
Laurent Destailleur
f884f16564
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/boxes.php
htdocs/comm/action/card.php
htdocs/core/class/html.formfile.class.php
2014-12-03 12:54:42 +01:00
Laurent Destailleur
7afe9de1c0
Start to debug batch/serial module
2014-12-03 00:42:14 +01:00
Laurent Destailleur
c3b74e66ff
Fix: Add constant to hide an obscur feature
2014-12-03 00:22:48 +01:00
Laurent Destailleur
bde5a5d307
Fix: Missing translation of batch-serial prouct module
2014-12-03 00:11:31 +01:00
aspangaro
477aeecdac
#1725 Missing table cells in services list header
2014-12-02 22:30:40 +01:00
Frédéric FRANCE
467274b79b
Update card.php
2014-11-30 21:57:10 +01:00
Laurent Destailleur
ef4bdcdb2a
Merge remote-tracking branch 'origin/3.7' into develop
2014-11-30 15:43:04 +01:00
Laurent Destailleur
e395fd8096
Fix CRLF
2014-11-30 15:24:39 +01:00
Ion Agorria
c36f94a9a3
Fixed dinamic typo to dynamic
2014-11-30 15:14:25 +01:00
Laurent Destailleur
01209ff844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/product/stock/card.php
2014-11-30 14:15:38 +01:00
Ion Agorria
004d88fe0b
Fixed error when creating a price selecting a expression without filling the numeric price
2014-11-30 02:15:16 +01:00
Laurent Destailleur
7303983610
Fixed: Ton of old bugs when debugging POS.
2014-11-30 01:35:58 +01:00
Ion Agorria
fac46b3b46
Code for dinamic prices funcionality
2014-11-29 06:31:35 +01:00
Laurent Destailleur
7f0a01936e
Fix a very old bug of conflicth into decrease stock when using point of
...
sale, not compatible with option defined into stock module.
2014-11-28 20:41:52 +01:00
Laurent Destailleur
d9cb9c1585
Merge pull request #2102 from aspangaro/develop-center
...
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
aspangaro
ef991e6c5d
HTML5 - <center> is deprecated - Need CSS - continue working
2014-11-24 06:43:15 +01:00
Laurent Destailleur
bc1d88d324
Fixed: The visualization of status with mutualized picto was lost, so i
...
restore old feature to keep same visual for all status and add hidden
option to switch to new.
2014-11-24 01:16:26 +01:00
Frédéric FRANCE
99e88c16c4
Update /product/stock/mouvement.php
2014-11-23 17:45:04 +01:00
Laurent Destailleur
33eae22b26
Merge pull request #2070 from frederic34/patch-5
...
(GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))
2014-11-23 17:40:28 +01:00
Laurent Destailleur
7678f9b13c
Merge pull request #2069 from frederic34/patch-4
...
Fix 1662 Search filter display discrepancy
2014-11-23 16:48:59 +01:00
Laurent Destailleur
3aef9d928b
Fix: W3C
2014-11-23 13:14:03 +01:00
Laurent Destailleur
97a6bd842d
Minor fixes.
2014-11-23 12:39:53 +01:00
Frédéric FRANCE
8bbc2d8db4
Update /product/stock/mouvement.php
2014-11-23 10:02:16 +01:00
Frédéric FRANCE
ffd435d9ff
Fix 1662 Search filter display discrepancy
2014-11-23 01:20:02 +01:00
Laurent Destailleur
d7b0aab71a
Clear works with all browsers
2014-11-22 15:52:08 +01:00
Laurent Destailleur
a7df54ef0d
Merge pull request #2044 from frederic34/patch-3
...
#1666 Clear sort filter works partially in product/services
2014-11-22 15:51:07 +01:00
Laurent Destailleur
8c440dea4a
Fxied: Syntax error
2014-11-22 15:47:14 +01:00
Juanjo Menent
3dacdf4e4a
Fix: Conflicts and remove duplicate code
2014-11-19 09:41:21 +01:00
Frédéric FRANCE
cd3bafbef7
Update list.php
2014-11-18 00:27:53 +01:00
Frédéric FRANCE
167cf258e7
#1666 Clear sort filter works partially in product/services
2014-11-17 23:53:01 +01:00
Laurent Destailleur
e3a8041b0d
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/facture.php
htdocs/user/fiche.php
2014-11-16 15:46:08 +01:00
Laurent Destailleur
c186f13218
Fix: Param $action was not defined.
...
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
ad661256c0
Fix: Bugs reported by scrutinizer
2014-11-15 16:20:03 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
Laurent Destailleur
7faedf0c69
Uniformize code for search
2014-11-15 11:59:02 +01:00
Laurent Destailleur
92cdef71e8
Fix: Graph report rubbish information. Better to have them as option.
2014-11-08 14:58:43 +01:00
Laurent Destailleur
5094c2c066
Merge pull request #1998 from frederic34/iconstock
...
Try to improve stock display for all stock increase/decrease options
2014-11-07 21:48:04 +01:00
aspangaro
acbbe823e8
Typo
2014-11-06 20:04:51 +01:00
frederic34
f23f16da86
Try to improve stock display for all stock increase/decrease options
2014-11-01 21:38:50 +01:00
Laurent Destailleur
4226c27ccf
Merge pull request #1965 from frederic34/patch-4
...
On/Off for Object (do not restrict to product)
2014-10-30 18:21:50 +01:00
Laurent Destailleur
badf379489
Fix: [ bug #1618 ] PHP Error thrown when saving a barcode
2014-10-27 01:56:06 +01:00
Laurent Destailleur
9619c0cdea
Fix: [ bug #1581 ] SQL injection possbile
2014-10-27 00:58:56 +01:00
Frédéric FRANCE
ba9d2c3690
Update card.php
2014-10-23 11:02:16 +02:00
Frédéric FRANCE
761fc32cc1
Update list.php
2014-10-18 22:51:24 +02:00
Frédéric FRANCE
8133b67878
Update product.php
2014-10-18 22:50:17 +02:00
Frédéric FRANCE
5e946d6466
Update card.php
2014-10-18 22:49:07 +02:00
Laurent Destailleur
4a60d57544
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/fiche.php
htdocs/product/liste.php
2014-10-18 21:08:09 +02:00
Frédéric FRANCE
3144fd6845
Update product.php
2014-10-18 18:52:16 +02:00
Frédéric FRANCE
3ab8e13157
Update list.php
2014-10-18 18:51:25 +02:00
Frédéric FRANCE
446e73d8b8
Update card.php
2014-10-18 18:49:47 +02:00
Frédéric FRANCE
830ec9c9cb
Update list.php
2014-10-18 16:36:28 +02:00
Frédéric FRANCE
b80b45c086
Update card.php
2014-10-18 15:55:10 +02:00
Frédéric FRANCE
3a49965820
Update product.php
2014-10-18 15:52:37 +02:00
Frédéric FRANCE
98db599c69
Update card.php
2014-10-18 15:51:05 +02:00
Laurent Destailleur
1f5b64c98e
Merge pull request #1964 from frederic34/patch-3
...
Use javascript On/Off tosell-tobuy if enabled
2014-10-18 15:36:17 +02:00
Frédéric FRANCE
889dbec97b
Use javascript On/Off tosell-tobuy if enabled
2014-10-18 15:07:38 +02:00
Laurent Destailleur
90d47cffae
Better error management and better error message for reporting upload or
...
error of images.
2014-10-18 14:56:06 +02:00
Laurent Destailleur
97f98d7e16
Merge pull request #1955 from frederic34/patch-2
...
Ajax On/Off for product tosell and tobuy
2014-10-18 14:18:14 +02:00
Laurent Destailleur
7a68d9a940
Miscellaneous fixes
2014-10-16 20:55:13 +02:00
Florian HENRY
eeffe4ed34
Reload object when product clone failed (cause of ref already exists) if
...
not done result is blanck pages (header wannot be rewrite (location
herder index.php) around line 1542
2014-10-16 13:57:07 +02:00
Florian HENRY
722f6e0db6
Fix right on product list
2014-10-15 15:24:31 +02:00
Frédéric FRANCE
99dde1ad1e
Update card.php
2014-10-12 20:44:50 +02:00
Frédéric FRANCE
633f01e5a2
Update card.php
2014-10-12 14:26:51 +02:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Laurent Destailleur
fc63e8b9dc
Fix: ErrorBadValueForParamNotAString error message in price customer
...
multiprice
2014-10-11 23:55:10 +02:00
BENKE Charles
00c5c940c9
Update product.class.php
...
Label of product on tooltip is more usefull than the ref who's already on the link
2014-10-09 21:31:35 +02:00
Laurent Destailleur
f9377a4715
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-10-08 20:57:11 +02:00
Laurent Destailleur
0a4d040e9d
Fix: Warning sur traduction
2014-10-07 21:15:14 +02:00
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Laurent Destailleur
b5be8ff620
Fix: Avoid error ErrorBadValueForParamNotAString
2014-10-03 02:45:47 +02:00
Laurent Destailleur
5ac63ec534
Solve fixme.
2014-10-03 02:00:50 +02:00
Florian HENRY
78ec4d595b
Fix trad currency
2014-10-02 15:21:49 +02:00
Regis Houssin
4248c7bed2
Fix: strict mode paradise
2014-10-02 09:30:31 +02:00
Florian HENRY
3f23c8956c
Merge remote-tracking branch 'origin/3.6' into 3.6_fixwebservice
2014-09-29 11:04:43 +02:00
Laurent Destailleur
ec95aacd52
Uniformize code for error reporting after a hook.
2014-09-28 03:41:32 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
Florian HENRY
4b74b0529f
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2014-09-22 09:36:24 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
ad8b92541d
Fix: sql request with pgsql
...
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
2014-09-20 00:57:29 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
aspangaro
9da597d56e
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-18 20:18:56 +02:00
aspangaro
7a9ce455d9
Uniformize code $_SERVER["PHP_SELF"]
2014-09-18 20:13:38 +02:00
Laurent Destailleur
9666d5e3ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
2014-09-18 10:17:43 +02:00
Laurent Destailleur
b16b1c2ce0
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/langs/en_US/errors.lang
htdocs/product/class/product.class.php
2014-09-18 10:08:56 +02:00
Laurent Destailleur
900cdd5368
Qual: Removed duplicate page.
2014-09-17 15:24:01 +02:00
Florian HENRY
c570b5fbfc
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2014-09-16 20:15:54 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
fffb0f1bde
Fix: bad translation key
2014-09-15 20:23:04 +02:00
Florian HENRY
ffc550de6d
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2014-09-15 09:59:02 +02:00
Florian HENRY
287e2ca032
Add ref_ext into fetch product (else fetch and update set this column to
...
null)
2014-09-15 09:58:44 +02:00
Florian HENRY
9493e252c9
add refext into fecth product
2014-09-15 09:56:40 +02:00
Marcos García de La Fuente
7a28f8e4aa
[ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger
2014-09-14 13:59:06 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
Laurent Destailleur
40686fde0d
Fix: Bad td balance
2014-09-09 14:51:29 +02:00
Laurent Destailleur
0cefe5af43
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/lib/date.lib.php
htdocs/fourn/facture/fiche.php
htdocs/includes/tcpdf/include/tcpdf_static.php
htdocs/product/price.php
2014-09-07 13:18:56 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Juanjo Menent
04c2c4379a
Merge pull request #1855 from grandoc/develop
...
add product minimum recommended price
2014-09-05 09:34:58 +02:00
Laurent Destailleur
f7c48558e6
Fix: balance with td
2014-09-02 19:45:05 +02:00
Laurent Destailleur
38233ca05d
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/limits.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/core/ajax/ziptown.php
2014-09-02 13:46:47 +02:00
Laurent Destailleur
e82e26c6fa
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/compta/facture.php
htdocs/core/js/lib_head.js
2014-09-02 12:57:33 +02:00
Laurent Destailleur
f64cb085a7
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.commande.class.php
2014-08-30 18:27:34 +02:00
Philippe GRAND
a448b7e36a
add product minimum recommended price
2014-08-29 19:19:26 +02:00
Philippe GRAND
61ae2f3f37
fix : missing translation
2014-08-27 11:34:24 +02:00
Laurent Destailleur
12c6752971
Fix: Can upload files on services.
2014-08-26 23:45:02 +02:00
Laurent Destailleur
50eb2e2c15
Fix: backlink was wrong after deleting product or service.
2014-08-18 18:24:57 +02:00
Laurent Destailleur
be6f99c10e
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/db/mysql.class.php
htdocs/core/db/mysqli.class.php
htdocs/core/lib/ajax.lib.php
2014-08-17 19:34:12 +02:00
Laurent Destailleur
3f8ec47e91
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
2014-08-16 17:37:37 +02:00
Laurent Destailleur
f0c9513fa9
Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead
...
of old ref
2014-08-16 17:18:53 +02:00
Laurent Destailleur
96cb9fe6cb
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-15 02:35:06 +02:00
Laurent Destailleur
6b6b372579
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/theme/eldy/graph-color.php
2014-08-15 02:28:16 +02:00
Florian HENRY
329c0b2913
Fix: Missing include files.lib.php in some pages ti use
...
dol_delete_recursive
2014-08-13 12:42:55 +02:00
KreizIT
c94c0699d8
Fix : [ bug #1549 ] Itïs not possible add ExtraFields
2014-08-06 17:38:44 +02:00
Laurent Destailleur
3024d82536
Merge pull request #1786 from atm-maxime/develop
...
Fix on class not extending commonobject
2014-08-04 08:58:54 +02:00
Juanjo Menent
eee17589b2
Fix: Price by customer: a client must be able to have multiple products
...
with customer prices
2014-08-01 18:24:38 +02:00
Juanjo Menent
c15da5f257
Fix: Price by customer: a client must be able to have multiple products
...
with customer prices
2014-08-01 18:22:39 +02:00
Laurent Destailleur
ed52fc20d6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-08-01 14:51:58 +02:00
Laurent Destailleur
605919be76
Fix: Too many parameter
...
Fix: Can't delete bank account
2014-08-01 14:51:40 +02:00
Juanjo Menent
268aabbacd
Fix: Price by customer
2014-08-01 13:27:54 +02:00
Juanjo Menent
32e110b6d9
Fix: Price by customer
2014-08-01 13:25:29 +02:00
Laurent Destailleur
95da79108f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-07-31 17:22:37 +02:00
Laurent Destailleur
8e5cbb1f6c
Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into
...
marcosgdf-patch-2
Conflicts:
test/phpunit/Functions2LibTest.php
2014-07-31 17:21:46 +02:00
Maxime Kohlhaas
b2ad8c74a5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-07-31 15:19:20 +02:00
Laurent Destailleur
c70a7ee63a
Merge pull request #1787 from frederic34/patch-facture
...
User must not see invoices if no rights
2014-07-31 14:38:46 +02:00
Marcos García de La Fuente
1c97b3f779
Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode
2014-07-30 15:47:19 +02:00
Marcos García de La Fuente
972d3c69b6
Removed duplicated requires.
...
Json.lib.php is included with functions.lib.php
2014-07-30 15:42:58 +02:00
frederic34
fada3ca9a2
User must not see invoices if no rights
2014-07-29 16:27:34 +02:00
Maxime Kohlhaas
d8cf23ad95
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-07-29 15:46:50 +02:00
Maxime Kohlhaas
6349e5e4a2
Class MouvementStock was not extending CommonObject so error on call_trigger function
2014-07-29 15:45:53 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
db091896a5
Prepare 3.6.
...
Use google adsense tag of foundation for doxygen doc pages.
Version is no more encoded int odoxygen.
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/impayees.php
htdocs/filefunc.inc.php
2014-07-26 18:10:51 +02:00
Laurent Destailleur
bf926cd791
Merge pull request #1756 from marcosgdf/messages
...
Migrated old message notifications to the """new""" system
2014-07-20 04:57:09 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731
Migrated old error notifications to the """new""" system
2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
434bb1bec7
Migrated old message notifications to the """new""" system
2014-07-20 00:10:40 +02:00
Laurent Destailleur
6637ea51e3
Fix: [ bug #1534 ] Unknown error when deleting a product photo under
...
special circumstances
2014-07-19 16:41:14 +02:00
Laurent Destailleur
a6992e116b
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
2014-07-18 23:24:39 +02:00
Cedric
f38ab46928
correction typo
2014-07-15 19:02:43 +02:00
Cedric
769c9a9b66
FIX stock inconsistency when activating batch management on product which already have stock
2014-07-15 11:22:16 +02:00
Laurent Destailleur
3a625ce6bf
Merge pull request #1741 from marcosgdf/url-not-available
...
Removed index.php and replaced them with blank index.html as it is more appropiate
2014-07-14 23:20:32 +02:00
Cedric
dda17f4082
Security fix
2014-07-14 20:00:22 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Cedric
d289306fa4
Security fix
2014-07-12 16:22:49 +02:00
KreizIT
b6edde320b
Conflict solved
2014-07-12 09:20:00 +02:00
KreizIT
5e7c0639b0
Refactor: various trigger
2014-07-11 16:02:27 +02:00
Laurent Destailleur
728ca22183
Merge pull request #1730 from GPCsolutions/accessibility
...
Accessibility
2014-07-11 14:57:02 +02:00
Raphaël Doursenaud
f6848e8655
Add label on search boxes
2014-07-11 13:26:02 +02:00
Laurent Destailleur
5c81074483
Merge pull request #1709 from KreizIT/review_trig2
...
Review trig2
2014-07-11 12:27:43 +02:00
Laurent Destailleur
ad4babb154
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
.travis.yml
htdocs/fichinter/fiche.php
2014-07-08 01:12:55 +02:00
Laurent Destailleur
4dbc1dd1c6
Merge remote-tracking branch 'origin/3.6' into develop
2014-07-06 21:09:10 +02:00
Florian HENRY
cb9e0983dd
Remove fetch_optionnal becauwe done in fetch from product class
2014-07-06 10:24:01 +02:00
Florian HENRY
02574a7af2
Fix Ajax combobox in Extrafeilds
...
Add Extrafield on contract
2014-07-05 11:17:50 +02:00
KreizIT
4666de85e2
Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message
2014-07-04 16:18:54 +02:00
KreizIT
012fc4e8fe
Fix: [ bug #1465 , #1466 ] Product triggers problem
2014-07-04 15:54:20 +02:00
Laurent Destailleur
ad15f3f1e9
New: Add option PRODUCT_MAX_VISIBLE_PHOTO to limit number of photos
...
shown on main product card.
2014-07-04 15:13:02 +02:00
Laurent Destailleur
6144f90770
New: Form to add a photo is immediatly available on photo page if
...
permissions are ok (save one click per photo to add).
2014-07-04 15:06:45 +02:00
Laurent Destailleur
e496823778
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
.travis.yml
ChangeLog
htdocs/fourn/commande/fiche.php
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
htdocs/product/stock/replenish.php
2014-07-04 14:14:40 +02:00
Maxime Kohlhaas
db0fa0afd0
Revert "Fix : ordered should display qty in supplier order not yet send"
...
This reverts commit f2248d5bc8
2014-07-03 18:17:34 +02:00
Maxime Kohlhaas
8eb8f33f28
Ajout qté dans écran consommation produit
2014-07-03 18:14:26 +02:00
Maxime Kohlhaas
f2248d5bc8
Fix : ordered should display qty in supplier order not yet send
2014-07-03 17:57:36 +02:00
Maxime Kohlhaas
51e4fa0d36
Fix : picto for already ordered product was missing
2014-07-03 15:31:51 +02:00
Maxime Kohlhaas
a26db9ab52
Fix : qty ordered was not including qty already received
2014-07-03 14:47:28 +02:00
Maxime Kohlhaas
a22963e432
Fix : filter by status + was not working if desiredstock not defined
2014-07-03 14:37:30 +02:00
Maxime Kohlhaas
830cc30f80
Fix : sendings and reception stock calculation must be on the same status than order and oreder supplier calculation
2014-07-03 12:31:55 +02:00
Maxime Kohlhaas
b115e9b943
Fix : replenish function was not working with virtual stock
2014-07-03 12:07:34 +02:00
Maxime Kohlhaas
959c41e8db
Fix : virtual stock was not correctly calculated because reception was not included.
2014-07-03 10:24:29 +02:00
Marcos García de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
c2f0d84e45
Fix: [ bug #1512 ] Manque des produits dans la page réapprovisionement
2014-07-02 19:35:02 +02:00
Laurent Destailleur
2c493a4fe3
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-06-28 14:55:04 +02:00
Laurent Destailleur
71ee974ddb
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-06-28 14:53:28 +02:00
Laurent Destailleur
a79aa1f203
Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop
...
Conflicts:
htdocs/product/class/product.class.php
2014-06-26 21:38:03 +02:00
Raphaël Doursenaud
f5980a1d20
Fix database prefix usage
2014-06-26 15:52:31 +02:00
Laurent Destailleur
018e1d31e3
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/class/product.class.php
htdocs/projet/class/project.class.php
2014-06-25 20:22:25 +02:00
BENKE Charles
13ce63ce99
replace mvid by $mvid, wrong week-end
2014-06-22 22:59:25 +02:00
BENKE Charles
3a886dfeb4
Update mouvementstock.class.php
...
return mouvement id instead simply "1", i need to store the movement id on my factory modules (to update it at the end of the build process if it's need)
2014-06-21 17:51:50 +02:00
Laurent Destailleur
d19b34cc7e
Fix: Renaming a project with uplaoded files failed.
2014-06-21 15:45:53 +02:00
BENKE Charles
7d76458488
Update entrepot.class.php
2014-06-21 11:39:21 +02:00
BENKE Charles
51a2c2f5cb
Update entrepot.class.php
...
bad element name
2014-06-21 10:43:47 +02:00
Laurent Destailleur
e2afa6853b
Fix: Deletion of translation has disappeared.
2014-06-20 15:05:39 +02:00
Laurent Destailleur
e1a461b3d6
Fix: [ bug #1436 ] réapprovisionnement sur plusieurs pages
...
Removed also strange image (no way to understand meaning).
2014-06-20 14:34:13 +02:00
Laurent Destailleur
d0dffc8999
Fix: Duplicate column
2014-06-20 14:13:23 +02:00
Laurent Destailleur
eb2f8bb733
Fix: [ bug #1427 ] erreur avec le bouton fiche suivante/précédente
2014-06-20 13:43:36 +02:00
Maxime Kohlhaas
f2760f74ed
Fix replenishment on virtual stock
2014-06-20 09:10:50 +02:00
Florian HENRY
c2fc40d62a
travis
2014-06-17 12:58:49 +02:00
Florian HENRY
4b78c8e11a
comment method in english
2014-06-17 12:21:34 +02:00
Florian HENRY
c4912c5e25
travis
2014-06-17 12:20:41 +02:00
Florian HENRY
df9f153142
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
2014-06-17 12:01:45 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
0ed2481a20
Removed unuseful errors
2014-06-13 01:46:27 +02:00
Marcos García de La Fuente
88cd5dec40
More substitutions
2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
fb0f0047e7
Merge pull request #1633 from aspangaro/develop
...
Typo / Missing key language / Fix limit list on mass movement stock page
2014-05-30 11:33:08 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
aspangaro
a725a08c13
Fix :: List limit is not defined or based on limit product configuration
...
Discussion http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50579-transfert-stock-pas-sur-tous-les-produits#51265
2014-05-28 06:20:56 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
12fed4f4d7
Fix: CRLF
2014-05-26 12:32:33 +02:00
Laurent Destailleur
5d9ec6807c
Fix: Show duration only if defined.
2014-05-26 01:14:15 +02:00
Laurent Destailleur
4b9d1b901b
Fix: [ bug #1401 ] Problème avec la génération des codes barres
2014-05-25 17:14:33 +02:00
Laurent Destailleur
1690da2369
Fix: Bad balance of td
2014-05-25 04:34:04 +02:00
Laurent Destailleur
ae01c785c5
Fix: Do not show ref supplier title if ref_supplier not set (currently
...
always the case with 3.5).
2014-05-25 03:57:13 +02:00
Laurent Destailleur
b7f55ea99c
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Laurent Destailleur
9ae9f062ac
Checkstyle
2014-05-14 12:25:30 +02:00
Laurent Destailleur
69eaefc459
Fix: The way we tested if a ref/id already exists was wrong. Introduce a
...
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
2014-05-13 10:12:45 +02:00
Laurent Destailleur
64f8dcf131
Fix: Bad syntax of vars
2014-05-12 12:10:52 +02:00
Alexis Algoud
f13c146908
Fix page numerotation as in company list
2014-05-12 11:00:58 +02:00
Laurent Destailleur
09b5971b7d
Fix: [ bug #1381 ] PHP Warning when listing stock transactions page
2014-05-11 18:05:59 +02:00
Francis Appels
c17f42b767
fix: if note not set, insert null iso "null"
...
when create class was called with note not set, text "null" was inserted
in database, changed to null. Also $note property was missing.
2014-05-10 14:57:22 +02:00
Laurent Destailleur
93393db991
Merge pull request #1539 from defrance69/patch-7
...
Update index.php
2014-05-04 19:15:21 +02:00
BENKE Charles
cefc62b20f
Update index.php
2014-05-04 18:42:58 +02:00
BENKE Charles
b12e87abc3
Update index.php
...
add the categories pie graph on product too (and correct some bug)
2014-05-04 18:42:00 +02:00
Laurent Destailleur
c2c0a9b4bb
Merge pull request #1568 from GPCsolutions/closingtagremoval
...
Qual: Remove the closing PHP tag
2014-05-04 18:08:37 +02:00
Laurent Destailleur
bc35728ea3
Merge pull request #1562 from marcosgdf/translation
...
Improved translations
2014-05-04 17:39:36 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
21c416805a
Moved the info about hidden constants DONOTSEARCH_ANYWHERE to a tooltip
2014-05-03 12:57:12 +02:00
Laurent Destailleur
f5b0651809
New: Add webservcie to delete a product.
...
Qual: More webservices in phpunit.
2014-05-02 16:47:54 +02:00
Laurent Destailleur
fc9c491d15
New: Add constant to set label for level prices.
2014-05-01 12:19:24 +02:00
Laurent Destailleur
9dd605bd8a
Simplify and comment code
2014-05-01 11:54:48 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Alexis Algoud
34948ef2d6
Add somes dol_escape_htmltag on product cards inputs
2014-04-23 14:53:23 +02:00
Juanjo Menent
d527c4cf73
Fix: Price min of composition is not supplier price min by quantity
2014-04-22 09:57:43 +02:00
Laurent Destailleur
bb2c829997
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
2014-04-18 12:34:32 +02:00
Laurent Destailleur
ce34c01b9e
New: On page to enter supplier prices, if there is no supplier, add
...
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
2014-04-16 00:06:16 +02:00
Laurent Destailleur
9fb029890c
Doxygen
2014-04-13 02:08:57 +02:00
BENKE Charles
32090eeeb5
Update product.class.php
...
init the stock_warehouse Array during fetch instead we omit to load the stock (wrong value stay inside)
2014-04-12 11:41:32 +02:00
Laurent Destailleur
81ff0a8643
Fix: Missing initialized value
2014-04-12 01:45:18 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
417a1232ef
Uniformize usage of function price
2014-04-11 18:00:58 +02:00
Grand Philippe
9a056ab497
anglicizing
2014-04-08 14:05:10 +02:00
Laurent Destailleur
9a8a306d78
Qual: Method form->select_currency() has been removed. Use instead
...
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
2014-04-02 14:53:42 +02:00
Laurent Destailleur
1affc38d58
Merge pull request #1509 from defrance69/patch-1
...
Update mouvement.php
2014-03-27 15:59:39 +01:00
Laurent Destailleur
68b54f5cac
New: Add hidden option PRODUCT_DISABLE_CUSTOM_INFO to disable custom
...
info management (used for export activity only)
2014-03-25 19:52:04 +01:00
BENKE Charles
680ce297c5
Update mouvement.php
...
sometime $year not filled then made "bug" the search
propose to fill with current year in this case
2014-03-25 15:41:20 +01:00
Laurent Destailleur
ada22837a5
Fix: form to add images should not show link form
2014-03-18 22:26:09 +01:00
Laurent Destailleur
3030c2f431
Fix: form to add images should not show link form
2014-03-18 22:24:57 +01:00
Laurent Destailleur
2d3c700a7d
Fix: When cloning product, autogenerating barcode must not use same
...
number.
Qual: Moved dedicated permission of module to "advance" permissions.
2014-03-16 17:37:54 +01:00
Maxime Kohlhaas
233a8fa917
Add new PHPUnit test on Entrepot
2014-03-16 11:38:39 +01:00
Maxime Kohlhaas
67342486a6
Task 1074 : add link to source document on stock movement
2014-03-15 02:18:39 +01:00
jean
9ccf99ab4a
correction erreur sql update url = null
2014-03-14 23:04:27 +01:00
Laurent Destailleur
4154f07dfd
New: Add a public url as a property for products/services.
2014-03-14 13:51:46 +01:00
Laurent Destailleur
bdb2b7a547
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/projet/index.php
test/phpunit/FunctionsTest.php
2014-03-13 09:20:05 +01:00
Laurent Destailleur
4acf721c8c
Merge pull request #1451 from KreizIT/dluo_step3
...
Batch number management Step 3
2014-03-11 15:54:23 +01:00
Laurent Destailleur
86ad05c22e
Merge pull request #1461 from marcosgdf/unknown-error
...
Corrected Unknown error message typo
2014-03-11 11:54:08 +01:00
Marcos García de La Fuente
fa56fe4e8b
Corrected Unknown error message typo
2014-03-10 19:36:32 +01:00
Laurent Destailleur
2a853329e5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
htdocs/product/class/product.class.php
2014-03-08 14:25:59 +01:00
Laurent Destailleur
06b2c646c3
Fix: Add a space after (int) for travis succes ;)
2014-03-06 18:31:02 +01:00
Alexis Algoud
d139009ef5
bug on update service with service created in 3.4
2014-03-05 15:29:28 +01:00
Laurent Destailleur
6c536d43e5
Can also sort on username. Uniformize code of index page.
2014-03-05 11:37:32 +01:00
KreizIT
d9ea0e0e8c
Travis again (It's susceptible)
2014-03-05 11:30:43 +01:00
KreizIT
feae560aa3
Travis correction.
2014-03-05 11:28:40 +01:00
Laurent Destailleur
e9adec49eb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-05 11:22:12 +01:00
Laurent Destailleur
60327e92d1
New: Add filter on text and status into survey list. Can also sorter on
...
id, text and date end.
2014-03-05 11:22:01 +01:00
KreizIT
58f2bf078b
-Add batch record management
...
-Implements stock increase or decrease with batch number record on product's warehouse tab
2014-03-05 10:54:07 +01:00
Laurent Destailleur
cdd2815d45
Merge pull request #1449 from KreizIT/dluo_step2
...
Dluo step2
2014-03-05 00:08:58 +01:00
KreizIT
7f275dfbf4
- Add table modification for product (forget in step 1)
...
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
2014-03-04 18:55:55 +01:00
Laurent Destailleur
24b0ea6613
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
0b83f1a670
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-03-01 15:06:25 +01:00
Laurent Destailleur
6f4de6e6d0
Fix: [ bug #520 ] Product statistics and detailed lists are wrong
2014-03-01 15:05:00 +01:00
Laurent Destailleur
dfb4117bb5
Fix: Invalid image link
2014-03-01 14:58:06 +01:00
Laurent Destailleur
b64a2b2718
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-28 21:43:29 +01:00
Laurent Destailleur
de159d569a
Fix: Missing transactions
2014-02-27 16:40:25 +01:00
Florian Henry
ec8ad9f8bb
codesniffer
2014-02-23 20:10:05 +01:00
Florian Henry
4cbdf32ae6
codesniffer
2014-02-23 17:21:26 +01:00
Florian Henry
46ae5d6e9c
- New: Price management enhancement (multiprice level, price by
...
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
2014-02-23 16:16:47 +01:00
Laurent Destailleur
2e67bbc382
Maxi debug of barcode feature.
...
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
2014-02-19 01:51:19 +01:00
Laurent Destailleur
908c39098d
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-16 19:47:51 +01:00
Laurent Destailleur
7e3c2d40ba
New: Make difference between virtual and physical stock easier to
...
understand.
2014-02-15 14:14:49 +01:00
Laurent Destailleur
ccab2b7af4
Fix: Must use "null" for value when finished is not defined but not when
...
finished is "0".
2014-02-12 19:00:06 +01:00
Laurent Destailleur
0d03f13777
Add comments
2014-02-12 15:21:06 +01:00
Laurent Destailleur
634c5b64f1
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/product/fiche.php
2014-02-12 00:25:08 +01:00
Laurent Destailleur
266b413139
Fix: colspan for extrafields
2014-02-12 00:23:15 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
e833849f85
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-02-10 01:12:14 +01:00
Laurent Destailleur
d81685a737
Merge pull request #1409 from atm-geoffrey/develop
...
Add hooks and triggers on supplier invoice, supplier order and product supplier price
2014-02-10 01:11:13 +01:00
Laurent Destailleur
b18c9603f1
Fix: Even if accounting module are disabled, we need field. Accounting
...
mdules disabled = we don't need menu+pages+reports features but
properties on product may be still used (for example to import/import
when using an external accounting software).
2014-02-10 01:04:40 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03
New: Generation auto of barcode is available for product.
2014-02-10 00:24:20 +01:00
Laurent Destailleur
319b13dafb
Fix: Field nature is not correctly filled.
2014-02-08 01:02:09 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
geoffrey.girard
bf6b4537b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2014-02-05 09:19:54 +01:00
Laurent Destailleur
26d134e4d8
Merge pull request #1404 from aspangaro/develop
...
Add The base accountancy belgium plan for accounting - Thanks delcroip
2014-02-04 17:10:29 -08:00
geoffrey.girard
05ceecd184
add hook printObjectLine on product supplier prices list
2014-02-04 16:55:09 +01:00
Gauthier
9cdfaa3ffe
add hook "doActions" on supplierprice form
2014-02-04 10:48:35 +01:00
aspangaro
bccf23711d
Kill clics - Accountancy in product card - Not display accountancy_code when module (comptabilite | accounting | accounting expert) is disabled
2014-02-02 18:26:17 +01:00
Laurent Destailleur
a2afea7ba9
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-30 18:21:04 +01:00
Laurent Destailleur
ebd8d5f8dd
New: Can input barcode during product creation step.
2014-01-28 19:11:22 +01:00
Laurent Destailleur
0d0fda8fae
Merge pull request #1382 from atm-geoffrey/develop
...
Add new doActions and formObjectOptions hook on supplier prices page
2014-01-27 01:43:08 -08:00
Laurent Destailleur
8d916215cc
New: Add new hook function addMoreActionsButtons to allow a module to
...
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
simnandez
72752f9a30
Fix: Bad navigation into stock product tab
2014-01-23 16:01:27 +01:00
simnandez
cd1313280c
Fix: Bad navigation into stock product tab
2014-01-23 16:00:15 +01:00
Laurent Destailleur
9519c89110
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-01-21 13:23:27 +01:00
Laurent Destailleur
d7e111b3bd
Fix: Missing parent tables
2014-01-21 13:18:30 +01:00
Laurent Destailleur
23e6709164
Better error message
2014-01-21 12:55:05 +01:00
Laurent Destailleur
cfd8601a70
Fix: Missing parent tables
2014-01-21 12:53:27 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
geoffrey.girard
e418e10df0
Add new doActions hook on supplier prices page
2014-01-17 09:45:57 +01:00
Laurent Destailleur
12ee5dece2
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-14 18:10:14 +01:00
Cedric GROSS
6d4a9833e2
Fix bug on stock calculation for replenishment: wrong order in ifsql.
2014-01-14 18:08:26 +01:00
Cedric GROSS
911c43c862
Fix bug on stock calculation for replenishment: wrong order in ifsql.
2014-01-13 19:46:23 +01:00
Grand Philippe
b61ccb8234
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:15:07 +01:00
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +01:00
Laurent Destailleur
5f65b2a97f
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-12 20:23:24 +01:00
Cédric Salvador
68e42bc24e
fixed wrong thumbnails directory
2014-01-07 17:26:12 +01:00
Laurent Destailleur
c7ef0b7c57
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/consumption.php
2014-01-07 16:41:00 +01:00
Laurent Destailleur
9a6f22a86e
Fix: W3C no form into table.
...
Fix: Css style overflowwithjm has been superseded by
maxwidthonsmartphone
Fix: Style button disabled was not visible with jmobile
Fix: Rounding corner with jmobile
2014-01-05 15:46:39 +01:00
Laurent Destailleur
0e62d79ce2
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-26 19:43:31 +01:00
Laurent Destailleur
fcfe94d4ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/product/liste.php
2013-12-24 16:28:27 +01:00
Cédric Salvador
f98838616e
Do not forget the thumbs directory when returning the images paths
2013-12-19 16:06:59 +01:00
Marcos García
9c6df4faf4
Corrected Copyright info for PR #1350
2013-12-16 22:56:59 +01:00
Laurent Destailleur
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +01:00
Marcos García
290b810bb8
Little refactor in product/liste.php
2013-12-15 18:49:55 +01:00
Marcos García
d65374bb02
Fixed bug #1196 : Product barcode search does not expect 13th digit on EAN13 type
...
Some code written by "hipnosapo" forum user in http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/3891-ean13-buscador-codigo-barras-13-digitos#3891
2013-12-15 18:44:53 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
f0eb98c27a
Fix: Serious pb with loading stocks. If we use product->stock_reel or
...
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
2013-12-10 19:42:49 +01:00
Laurent Destailleur
a6b188ed93
Fix: We should not load stock details at each product fetch
2013-12-10 19:41:45 +01:00
Laurent Destailleur
da569ea8d4
Fix: Serious pb with loading stocks. If we use product->stock_reel or
...
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
2013-12-10 19:39:28 +01:00
Laurent Destailleur
aa4ae60826
Fix: sql where on an int must not contains '
2013-12-10 18:54:44 +01:00
Laurent Destailleur
df779086a6
Fix: We should not load stock details at each product fetch
2013-12-10 18:04:25 +01:00
Laurent Destailleur
c78fc504af
Fix: sql where on an int must not contains '
2013-12-10 17:21:48 +01:00
Laurent Destailleur
73e60e0629
Fix: Mass update of vat must work also for supplier prices
...
Conflicts:
htdocs/product/admin/product_tools.php
2013-12-07 12:06:41 +01:00
Laurent Destailleur
fa0470bdb9
Fix: Mass update of vat must work also for supplier prices
2013-12-07 02:29:24 +01:00
Laurent Destailleur
01a9b23f26
Fix: Vat rate was not set during update
2013-12-07 01:22:27 +01:00
Laurent Destailleur
5715e9c986
Merge remote-tracking branch 'origin/3.5' into develop
2013-11-28 17:06:11 +01:00
Laurent Destailleur
d1e62bebf0
Fix: Removed a merged that we ddidn't want.
2013-11-28 17:01:37 +01:00
Laurent Destailleur
bdf8100d84
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/product/stats/commande_fournisseur.php
2013-11-28 15:54:12 +01:00
Florian Henry
2178ab6007
Fix [ bug #1156 ] Update TVA mass update tools do not work
2013-11-27 22:05:29 +01:00
Florian Henry
6615ee7e6f
[ bug #1148 ] Product consomation : supplier order bad status
2013-11-23 14:59:28 +01:00
Laurent Destailleur
64031f92fa
Fix: Problem with W3C and wrapping of some title lines.
2013-11-23 14:50:13 +01:00
Laurent Destailleur
20e6ca74c7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-22 18:25:08 +01:00
simnandez
58a8f590e6
New: Add graph stats for suppliers orders in tab "stats" on products.
2013-11-22 14:47:16 +01:00
Laurent Destailleur
04fdfb4047
Fix: Problem with W3C and wrapping of some title lines.
2013-11-22 11:45:42 +01:00
Laurent Destailleur
9e9a386852
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/compta/facture.php
2013-11-21 02:19:21 +01:00
Laurent Destailleur
e63dcc5343
Fix: [ bug #1119 ] If no country is selected for a warehouse or thids
...
card,
broken IMG is shown
2013-11-21 02:14:25 +01:00
Laurent Destailleur
358175b357
Merge remote-tracking branch 'origin/3.4' into develop
2013-11-20 23:48:06 +01:00
Laurent Destailleur
35596acf40
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/product/fiche.php
2013-11-20 23:46:33 +01:00
Christophe Battarel
e654dac578
[Task 1144 ] Fix wrong max-length of produt ref
2013-11-20 10:33:06 +01:00
Florian Henry
ed21b573ea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-20 00:46:50 +01:00
Laurent Destailleur
0e743d5024
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Laurent Destailleur
2d260fa6dd
Fix: Missing alignement
2013-11-18 14:25:53 +01:00
Florian Henry
cc43fac0aa
Add status filter into product list
2013-11-17 17:25:14 +01:00
Laurent Destailleur
b3a1d695cd
Qual: Better message for total of buying price
...
Fix: Little debug of add link feature. Link was broken because of
missing http, fix W3C making output wrong with some browsers.
2013-11-15 11:43:16 +01:00
Laurent Destailleur
a0358dc0c2
Better management of price of subproducts feature
2013-11-14 20:54:40 +01:00
Laurent Destailleur
b911d30684
Fix: Stock into subproduct was wrong
...
New: Show best sell price and total for virtual products
2013-11-14 17:16:17 +01:00
Laurent Destailleur
4b26d8441b
Fix: Entry lost
2013-11-09 12:52:06 +01:00
Maxime Kohlhaas
1c6edf2d03
Fix : error in replenish SQL
2013-11-08 14:07:11 +01:00
Laurent Destailleur
b2308ba65c
Merge pull request #1284 from GPCsolutions/links
...
Links
2013-11-06 17:15:49 -08:00
Laurent Destailleur
94afc84a0c
Fix: price should not be lower than min price.
2013-11-06 19:31:13 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
c96b2d3b87
factorized form attach, documents list and links list for the document pages
2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Florian Henry
11d2af0f7e
Fix hook object call
2013-11-01 23:20:10 +01:00
Florian Henry
48c8b470af
Add hook into product/document.php
2013-11-01 18:59:00 +01:00
Laurent Destailleur
ca95bd67f8
Qual: control of delete usage
2013-10-27 02:23:25 +02:00
Laurent Destailleur
27e59866b0
Fix: responsive desing of page
2013-10-27 01:08:37 +02:00
Laurent Destailleur
7b2e6a2974
Fix: responsive desing of page
2013-10-27 00:34:25 +02:00
Laurent Destailleur
656bf480ac
Fix: look with jmobile
2013-10-27 00:04:57 +02:00
Laurent Destailleur
31430bb2f9
Solution to support overflow with jmobile
2013-10-26 23:44:19 +02:00
Laurent Destailleur
f67537799b
Fix: Wrong usage of new preoutput confirm box
2013-10-26 18:46:07 +02:00
Laurent Destailleur
1ae27b0977
Qual: Remove a useless action button to save one click.
2013-10-26 16:34:31 +02:00
Laurent Destailleur
3050facb96
Fix: [ bug #1070 ] Accountancy code not displayed just after set
...
Conflicts:
htdocs/product/fiche.php
2013-10-23 18:29:34 +02:00
Laurent Destailleur
a7ef6e5d70
Fix: [ bug #1070 ] Accountancy code not displayed just after set
2013-10-23 16:24:31 +02:00
Laurent Destailleur
305ca25267
New: Add menu entry to page massstockmove.php
2013-10-20 14:05:51 +02:00
Laurent Destailleur
16b2741834
New: Finished page to make mass stock movement
2013-10-18 19:23:27 +02:00
Laurent Destailleur
bd06ee1abe
Prototyping for other table outputs (div or datatable)
2013-10-17 18:37:08 +02:00
Francis Appels
d7fc0eea43
fix: _create()
...
add 'require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';'
to htdocs/product/stock/class/mouvementstock.class.php _create method.
This to support product class instance used in function.
2013-10-15 11:12:41 +02:00
Francis Appels
dde9a6da39
fix: delete()
...
The delete method does not delete product_stock record.
Typing error in delete product record debug log, sql iso sqlz
2013-10-15 11:11:42 +02:00
Laurent Destailleur
61b98275f5
Fix: Error message
2013-10-14 16:01:01 +02:00
Laurent Destailleur
0d36329336
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-10-14 15:56:42 +02:00
Laurent Destailleur
56730741bc
New: Add page to make mass stock transfert.
2013-10-11 13:12:21 +02:00
Laurent Destailleur
ef4970476a
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/product/stock/mouvement.php
2013-10-10 22:59:22 +02:00
Laurent Destailleur
e12d31766a
Fix: Hide a report at wrong place and add a comment to explain where to
...
put it and to fix the calculation method.
2013-10-10 17:34:26 +02:00
Laurent Destailleur
ae8f0c3efd
New: Add number of product in stock before and after selected period
...
when a filter is done on a period + a specific product.
2013-10-10 17:16:15 +02:00
Laurent Destailleur
f225b35a90
Fix: filter on warehouse
...
Conflicts:
htdocs/product/stock/mouvement.php
2013-10-10 15:51:59 +02:00
Laurent Destailleur
bb492d6d1f
Fix: filter on warehouse
2013-10-10 15:45:03 +02:00
Laurent Destailleur
a11a0d6491
Fix: debug replanishment feature
2013-10-09 21:09:15 +02:00
Laurent Destailleur
41bf4d53a8
Fix: filter on warehouse
...
Conflicts:
htdocs/product/stock/mouvement.php
2013-10-09 20:44:42 +02:00
Laurent Destailleur
661faa63dd
Fix: filter on warehouse
2013-10-09 20:42:46 +02:00
Laurent Destailleur
f4a83f0851
Qual: Debug of replenishment feature
2013-10-09 20:30:49 +02:00
Laurent Destailleur
61f583e035
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-10-02 16:19:54 +02:00
Laurent Destailleur
4a59a99190
Fix: No filter when already on filtered warehouse.
2013-10-02 16:19:35 +02:00
Laurent Destailleur
3fb890e9b7
New: Add total of unique different product into warehouse
2013-10-02 12:49:28 +02:00
Laurent Destailleur
957ff08458
New: Add update method for web service product.
2013-10-01 11:59:35 +02:00
Laurent Destailleur
b695204259
Fix: invert parameters
2013-09-28 13:27:53 +02:00
Laurent Destailleur
019c86dff0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2013-09-28 13:26:52 +02:00
Laurent Destailleur
4cf84c4ea8
New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS
2013-09-28 13:24:58 +02:00
Laurent Destailleur
9b36df85dd
Fix: invert parameters
2013-09-28 13:22:28 +02:00
Laurent Destailleur
3fde695c94
Qual: Uniformise name of include files we use to share common code found
...
into Actions area of pages (controllers).
2013-09-23 13:22:28 +02:00
Laurent Destailleur
dd0612099c
Qual: Uniformize fields departement_id into state_id
2013-09-20 14:35:58 +02:00
Laurent Destailleur
e47165fa38
Merge pull request #1239 from csalvador/replenishment-fix
...
Replenishment fix
2013-09-16 10:39:35 -07:00
Cédric Salvador
967c20e3e9
Improved error message
2013-09-16 14:51:22 +02:00
Cédric Salvador
c62c7c0b1f
Stock calculation was wrong in certain cases, should be ok now
2013-09-16 14:37:53 +02:00
Cédric Salvador
fc136d0d06
changed parameter
2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9
natural search in list pages
2013-09-16 14:17:53 +02:00
Laurent Destailleur
72557437ef
Checkstyle
2013-09-10 14:19:36 +02:00
Laurent Destailleur
8a82b01b22
Merge pull request #1217 from csalvador/replenishment-fix
...
Replenishment fix
2013-09-06 13:48:47 -07:00
Laurent Destailleur
dfce949b06
Merge pull request #1219 from csalvador/hide_purchase_price
...
Hide purchase price
2013-09-06 13:48:04 -07:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Cédric Salvador
4454bc16de
indentation
2013-09-06 10:49:18 +02:00
Cédric Salvador
d592e776fd
hide purchase price unless the user has the appropriate rights
...
Conflicts:
htdocs/product/liste.php
2013-09-06 10:40:33 +02:00
Cédric Salvador
413d76ce51
fixed error level
2013-09-06 09:56:07 +02:00
Raphaël Doursenaud
1db9cdac28
Fixed pagination
2013-09-06 09:56:07 +02:00
Cédric Salvador
d8e5fbc662
keep the alert filter when changing page
2013-09-06 09:56:06 +02:00
Cédric Salvador
a9ca9c04ef
Fixed request returning nothing when there's no records in llx_product_stock
2013-09-06 09:56:06 +02:00
Cédric Salvador
0a6079934b
alertonly checkbox stays checked
2013-09-06 09:56:06 +02:00
Cédric Salvador
41ad9bdb7f
frenglish is bad
2013-09-06 09:56:06 +02:00
Cédric Salvador
6015a36183
filter on stock alert
2013-09-06 09:56:06 +02:00
Cédric Salvador
bbae47c48f
natural search
2013-09-06 09:56:06 +02:00
Cédric Salvador
b58297a791
fixed warning showing up when searching
2013-09-06 09:56:05 +02:00
Cédric Salvador
6a51f5f87a
don't jump to the product card when there's only one research result
2013-09-06 09:56:05 +02:00
Grand Philippe
222eb18bb9
fix :
...
Fatal error: Call to undefined function dol_time_plus_duree()
2013-09-03 17:37:22 +02:00
Laurent Destailleur
20b92ca4d7
Merge pull request #1160 from defrance69/patch-10
...
Update index.php
2013-09-01 15:20:57 -07:00
Laurent Destailleur
1f6d0ab3ef
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/product/class/product.class.php
2013-08-27 09:36:54 +02:00
Florian Henry
2dce07590c
Fix: If only service module is activated, it's impossible to delete
...
service
2013-08-26 14:39:35 +02:00
Laurent Destailleur
8c90ad8afa
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/modFacture.class.php
htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
htdocs/expedition/fiche.php
htdocs/fourn/fiche.php
htdocs/langs/el_GR/admin.lang
htdocs/langs/el_GR/agenda.lang
htdocs/langs/el_GR/banks.lang
htdocs/langs/el_GR/bills.lang
htdocs/langs/el_GR/bookmarks.lang
htdocs/langs/el_GR/boxes.lang
htdocs/langs/el_GR/cashdesk.lang
htdocs/langs/el_GR/categories.lang
htdocs/langs/el_GR/commercial.lang
htdocs/langs/el_GR/companies.lang
htdocs/langs/el_GR/compta.lang
htdocs/langs/el_GR/contracts.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/deliveries.lang
htdocs/langs/el_GR/dict.lang
htdocs/langs/el_GR/donations.lang
htdocs/langs/el_GR/ecm.lang
htdocs/langs/el_GR/errors.lang
htdocs/langs/el_GR/exports.lang
htdocs/langs/el_GR/externalsite.lang
htdocs/langs/el_GR/ftp.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/holiday.lang
htdocs/langs/el_GR/install.lang
htdocs/langs/el_GR/interventions.lang
htdocs/langs/el_GR/languages.lang
htdocs/langs/el_GR/ldap.lang
htdocs/langs/el_GR/mailmanspip.lang
htdocs/langs/el_GR/mails.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/members.lang
htdocs/langs/el_GR/opensurvey.lang
htdocs/langs/el_GR/orders.lang
htdocs/langs/el_GR/oscommerce.lang
htdocs/langs/el_GR/other.lang
htdocs/langs/el_GR/paybox.lang
htdocs/langs/el_GR/paypal.lang
htdocs/langs/el_GR/products.lang
htdocs/langs/el_GR/projects.lang
htdocs/langs/el_GR/propal.lang
htdocs/langs/el_GR/sendings.lang
htdocs/langs/el_GR/shop.lang
htdocs/langs/el_GR/sms.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/el_GR/trips.lang
htdocs/langs/el_GR/users.lang
htdocs/langs/el_GR/withdrawals.lang
htdocs/langs/el_GR/workflow.lang
htdocs/margin/productMargins.php
2013-08-24 22:41:32 +02:00
Laurent Destailleur
9da5f7f47a
Qual: Doxygen
2013-08-22 16:49:23 +02:00
simnandez
1f05800909
Fix: [ bug #1037 ] Consumption> Supplier invoices related
2013-08-21 12:08:43 +02:00
simnandez
4e34e7b71c
Fix: [ bug #1037 ] Consumption> Supplier invoices related
2013-08-21 12:06:02 +02:00
BENKE Charles
12479a946a
Update index.php
...
Error on column titles
2013-08-07 07:28:37 +02:00
BENKE Charles
54d2f1161d
Update index.php
...
change datep
2013-08-07 07:15:09 +02:00
BENKE Charles
024ba2ee42
Update index.php
...
Add quarter report of sell service/product
2013-08-06 21:31:32 +02:00
Laurent Destailleur
afae841ae4
Fix: Permissions on files
2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe
Fix: Permissions on files
2013-08-06 00:36:04 +02:00
Cédric Salvador
3c93aac071
init cond_reglement_id and mode_reglement_id to 0 in orders creations to avoid SQL errors
2013-08-01 15:03:47 +02:00
Cédric Salvador
1993964a46
don't display product if desiredstock = 0 or null
2013-07-29 12:31:17 +02:00
Cédric Salvador
44bde866ee
link to go to the second tab and only display orders related to a certain product
2013-07-29 12:31:17 +02:00
Cédric Salvador
c756d34940
changed pictos used in replenish.php
2013-07-29 12:31:17 +02:00
Cédric Salvador
72a3bd9bdd
moved warning picto
2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
7d573bce1d
PSR-0 coding style
2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
18ec06a7f9
Allowed displaying products without buying price
2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
8d6591ac2f
Better comment
2013-07-29 12:31:16 +02:00
Cédric Salvador
5643a714ce
changed tab name
2013-07-29 12:31:16 +02:00
Cédric Salvador
d4052f7b9c
warning message if you try to create orders without selecting any product
2013-07-29 12:31:16 +02:00
Cédric Salvador
9ff183d432
debug checkbox + use textfields in the to order column
2013-07-29 12:31:16 +02:00
Cédric Salvador
6bf95db95e
checkbox + improve order detection
2013-07-29 12:31:16 +02:00
Cédric Salvador
3df097695d
removed useless variable
2013-07-29 12:31:16 +02:00
Cédric Salvador
a607cb677d
Bug fix: stock to buy now computes correctly when the stock too low picto is present
2013-07-29 12:31:15 +02:00
Cédric Salvador
357dc3e530
datepicker
2013-07-29 12:31:15 +02:00
Cédric Salvador
5062eb8006
check types on getpost + date research
2013-07-29 12:31:15 +02:00
Cédric Salvador
4b90157aa2
switch from print to echo
2013-07-29 12:31:15 +02:00
Raphaël Doursenaud
7abf23c471
PSR coding style
2013-07-29 12:31:15 +02:00
Cédric Salvador
fe8eb1be92
code cleanup
2013-07-29 12:31:14 +02:00
Cédric Salvador
d1550173cd
changed valid button label, position and look
2013-07-29 12:31:14 +02:00
Cédric Salvador
1a41511874
redirect user after orders creation
2013-07-29 12:31:14 +02:00
Cédric Salvador
2c3053b9ee
selects
2013-07-29 12:31:14 +02:00
Cédric Salvador
72afadb84e
fixed success message showing up even when you don't create orders
2013-07-29 12:31:14 +02:00
Cédric Salvador
787125cf12
reformat
2013-07-29 12:31:14 +02:00
Cédric Salvador
3b6fa4a52b
message when succeeds/fails to create orders
2013-07-29 12:31:14 +02:00
Cédric Salvador
3c04c6c35b
Split the page in two tabs, filters and pagination should work now
2013-07-29 12:31:13 +02:00
Cédric Salvador
407ffb8dd7
typo
2013-07-29 12:31:13 +02:00
Cédric Salvador
47177a2590
typo
2013-07-29 12:31:13 +02:00
Cédric Salvador
c919826104
psr 0
2013-07-29 12:31:13 +02:00
Cédric Salvador
ef8d05676f
display the ordered quantity in the ordered column
2013-07-29 12:31:13 +02:00
Cédric Salvador
b261ef2aa2
ordered column
2013-07-29 12:31:13 +02:00
Cédric Salvador
c0c2f9af42
fixed error when trying to create an order when a line has no associated supplier
2013-07-29 12:31:12 +02:00
Cédric Salvador
bcbe940ac0
fixed SQL error when trying to generate an order without selecting any product line
2013-07-29 12:31:12 +02:00
Cédric Salvador
52cfecd0af
added an option to use virtual stock instead of physical stock
2013-07-29 12:31:12 +02:00
Cédric Salvador
d4aa2a0f79
show service lines only if the stock services option is enabled
2013-07-29 12:31:12 +02:00
Cédric Salvador
bdb2a00539
products now show up in the list even when they don't have a line in llx_product_stock
2013-07-29 12:31:12 +02:00
Cédric Salvador
d31064a8b1
comments
2013-07-29 12:31:11 +02:00
Cédric Salvador
e5a70ade85
filter out lines where stock > desiredstock
2013-07-29 12:31:11 +02:00
Cédric Salvador
8d00838fa5
moved page + added link in the left menu
2013-07-29 12:31:11 +02:00
Cédric Salvador
194a5f071e
trans
2013-07-29 12:31:11 +02:00
Cédric Salvador
6f2bea124f
some improvement to the wizard UI
2013-07-29 12:31:11 +02:00
Cédric Salvador
47a1ffd58c
order creation wizard
2013-07-29 12:31:11 +02:00
Cédric Salvador
d3975bce7a
copyright
2013-07-29 12:31:11 +02:00
Cédric Salvador
e92858be36
wizard UI
2013-07-29 12:31:10 +02:00
Raphaël Doursenaud
2f5f96dc13
PSR coding style
2013-07-29 12:31:10 +02:00
Cédric Salvador
f0243646df
code cleanup
2013-07-29 12:31:10 +02:00
Cédric Salvador
dbdaa379c8
reformat
2013-07-29 12:31:10 +02:00
Cédric Salvador
2a4ce81f44
changed valid button label, position and look
2013-07-29 12:31:10 +02:00
Cédric Salvador
2900227236
redirect user after orders creation
2013-07-29 12:31:10 +02:00
Cédric Salvador
9dfa5c4218
selects
2013-07-29 12:31:09 +02:00
Cédric Salvador
89ceafaef5
research by date
2013-07-29 12:31:09 +02:00
Cédric Salvador
6e55d1c471
fixed success message showing up even when you don't create orders
2013-07-29 12:31:09 +02:00
Cédric Salvador
810743cddc
fixed research calling replenish.php
2013-07-29 12:31:09 +02:00
Cédric Salvador
2c82484d45
reformat
2013-07-29 12:31:09 +02:00
Cédric Salvador
4c50b23b40
message when succeeds/fails to create orders
2013-07-29 12:31:09 +02:00
Cédric Salvador
a637127599
Split the page in two tabs, filters and pagination should work now
2013-07-29 12:31:09 +02:00
Cédric Salvador
e9ef91cdbc
typo
2013-07-29 12:31:08 +02:00
Cédric Salvador
8517706ec2
typo
2013-07-29 12:31:08 +02:00
Cédric Salvador
2f6c979c32
psr 0
2013-07-29 12:31:08 +02:00
Cédric Salvador
e068655e6e
display the ordered quantity in the ordered column
2013-07-29 12:31:08 +02:00
Cédric Salvador
dcc6a9aad8
ordered column
2013-07-29 12:31:08 +02:00
Cédric Salvador
47a07c1c29
fixed error when trying to create an order when a line has no associated supplier
2013-07-29 12:31:07 +02:00
Cédric Salvador
d262f044ce
fixed SQL error when trying to generate an order without selecting any product line
2013-07-29 12:31:07 +02:00
Cédric Salvador
9b4601bcf2
added an option to use virtual stock instead of physical stock
2013-07-29 12:31:07 +02:00
Cédric Salvador
737aa7819f
show service lines only if the stock services option is enabled
2013-07-29 12:31:07 +02:00
Cédric Salvador
80a9dbfb90
products now show up in the list even when they don't have a line in llx_product_stock
2013-07-29 12:31:07 +02:00
Cédric Salvador
9f4e641cd9
comments
2013-07-29 12:31:06 +02:00
Cédric Salvador
66cb265d2b
filter out lines where stock > desiredstock
2013-07-29 12:31:06 +02:00
Cédric Salvador
da5bbd0a08
moved page + added link in the left menu
2013-07-29 12:31:06 +02:00
Cédric Salvador
2566f9017d
trans
2013-07-29 12:31:06 +02:00
Cédric Salvador
b8f5aef27f
some improvement to the wizard UI
2013-07-29 12:31:05 +02:00
Cédric Salvador
3e77575768
order creation wizard
2013-07-29 12:31:05 +02:00
Cédric Salvador
6927274d2a
copyright
2013-07-29 12:31:05 +02:00
Cédric Salvador
c1116b672f
wizard UI
2013-07-29 12:31:05 +02:00
Cédric Salvador
1c8ac0e9bb
display the desiredstock field in product/liste.php
2013-07-29 12:31:05 +02:00
Cédric Salvador
4f39913146
display the desiredstock field in product/reassort.php
2013-07-29 12:31:05 +02:00
Cédric Salvador
ea2d94451a
added the desired stock field to the Stock UI
2013-07-29 12:31:04 +02:00
Cédric Salvador
e36613f0f0
added the desired stock field to the create/edit product UI
2013-07-29 12:31:04 +02:00
Laurent Destailleur
1d4ce231db
Add manually patch
...
9ae9b2b02a
2013-07-27 12:22:00 +02:00
Laurent Destailleur
d802470aae
I killed <td nowrap>. Hello <td class="nowrap"> !
2013-07-19 14:23:42 +02:00
Laurent Destailleur
a240dba290
Fix: Translation of text
2013-07-18 19:01:19 +02:00
Laurent Destailleur
27a435994a
Qual: Some methods object->addline used a first parameter that was
...
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
2bc650bf61
Qual: Remove tons of codesniffer errors and warnings.
2013-07-07 13:14:32 +02:00
Laurent Destailleur
1d8b9949d6
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/compta/bank/categ.php
htdocs/compta/bank/releve.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/contacts.tpl.php
htdocs/cron/list.php
htdocs/main.inc.php
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/theme/bureau2crea/style.css.php
htdocs/theme/eldy/style.css.php
htdocs/user/class/user.class.php
htdocs/viewimage.php
2013-06-24 20:02:02 +02:00
Laurent Destailleur
cba1d73dd4
Fix: Can autoselect warehouse if only one warehouse
2013-06-24 19:34:56 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Regis Houssin
cb9dcfa369
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a
New: add product price sharing for multicompany
2013-06-24 17:13:08 +02:00
Regis Houssin
9992bebb13
New: add product price sharing for multicompany
2013-06-24 17:12:41 +02:00
Laurent Destailleur
0ab500d3a7
Merge pull request #1063 from grandoc/develop
...
standardize code
2013-06-21 08:10:01 -07:00
Laurent Destailleur
570275cd76
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/opensurvey.lang
htdocs/opensurvey/public/index.php
2013-06-21 15:37:17 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Florian Henry
035edc12ce
Fix [ bug #945 ] error adding a service
2013-06-19 14:41:18 +02:00
Marcos García
4532399026
CR Fix
...
I'm getting tired of these commits...
2013-06-19 09:26:20 +02:00
Laurent Destailleur
71b61fc1f5
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/langs/fr_FR/mails.lang
htdocs/user/logout.php
2013-06-18 09:51:37 +02:00
Laurent Destailleur
869e877cb7
Qual: We must not concat currency symbol after a price, but use the
...
parameter currency of method price.
2013-06-17 11:58:55 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
706b0d562f
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-15 01:09:08 +02:00
Marcos García
829b3bfc1d
CR fix
...
GIt required mi to commit this changes
2013-06-14 12:48:27 +02:00
Laurent Destailleur
499440be16
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-14 01:29:43 +02:00
Laurent Destailleur
396cbcec62
Fix: Do not update twice level 1
...
Conflicts:
htdocs/product/admin/product_tools.php
2013-06-14 01:23:54 +02:00
Laurent Destailleur
99cbee6486
Fix: Do not update twice level 1
2013-06-14 01:22:38 +02:00
Laurent Destailleur
980901b557
Qual: id of an instance should not be provided into method of instance
2013-06-14 00:23:38 +02:00
Laurent Destailleur
6750987dcb
Qual: id of an instance should not be provided into method of instance
2013-06-14 00:21:17 +02:00
Laurent Destailleur
5f60a7c88c
Fix: Multiprices were not update by mass vat update tool
2013-06-14 00:11:57 +02:00
Laurent Destailleur
bd8f1f2d2f
Fix: Multiprices were not update by mass vat update tool
2013-06-14 00:11:15 +02:00
Laurent Destailleur
d3a500d6c4
Fix: Missing price level for triggers
2013-06-13 23:26:06 +02:00
Laurent Destailleur
12c3fe2558
Fix: Missing price level for triggers
2013-06-13 23:24:58 +02:00
Laurent Destailleur
d9f5151c39
Fix: Bad default value for finished property
2013-06-13 15:53:17 +02:00
Laurent Destailleur
febe74ad17
Merge pull request #1038 from marcosgdf/clone-composition
...
Clone composition
2013-06-12 13:26:40 -07:00
Laurent Destailleur
93c71d00f7
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/comm/mailing/cibles.php
htdocs/core/class/hookmanager.class.php
2013-06-12 22:17:15 +02:00
Marcos García
13bcb5daaa
Merge branch 'develop' into clone-composition
...
Conflicts:
ChangeLog
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2013-06-12 16:39:23 +02:00
Laurent Destailleur
2483f044c5
Fix: Trans
2013-06-12 16:28:36 +02:00
Laurent Destailleur
4ba24ed8d7
Fix: Missing empty value
2013-06-11 12:58:52 +02:00
Florian Henry
8510c9c0d7
Add hook into referent product screen
2013-06-11 11:46:38 +02:00
Marcos García
e727100cf0
New: Clone product/service composition
2013-06-10 00:11:25 +02:00
Laurent Destailleur
51d11ff190
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/includes/tcpdf/tcpdf.php
htdocs/langs/el_GR/other.lang
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/en_US/main.lang
htdocs/langs/es_ES/products.lang
htdocs/main.inc.php
test/phpunit/NumberingModulesTest.php
2013-06-09 16:49:47 +02:00
Marcos García
f0454926c2
Fix bug #933 : Ajax error
...
Caused by commit 7e53f98
2013-06-08 22:29:18 +02:00
Marcos García
a06de736c2
Merge branch '3.4' into translations
2013-06-08 20:29:07 +02:00
Marcos García
000de9530d
Fixed wrong translation key and and improved es_ES translations
2013-06-08 20:15:48 +02:00
Marcos García
3cff899b44
Removed debug message and wrong translation key
2013-06-08 20:01:51 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
eac4aa7e28
New: Module mailman can subscribe/unsubscribe to ML according to
...
categories of member.
2013-06-05 15:44:42 +02:00
Laurent Destailleur
eadfa66f2c
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/infobox.class.php
2013-06-04 22:59:28 +02:00
Laurent Destailleur
3cb6e196b6
Fix: [ bug #919 ] SQL error in product/stock/product.php
2013-06-04 00:31:54 +02:00
Laurent Destailleur
205ff535a9
Fix: [ bug #919 ] SQL error in product/stock/product.php
2013-06-04 00:30:38 +02:00
Laurent Destailleur
a1a8fac25c
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-03 11:15:15 +02:00
Laurent Destailleur
6cf1d25529
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2013-06-03 11:09:40 +02:00
Marcos García
c12da33dcd
Fixed empty table when few modules are activated in product card view
2013-06-02 00:37:33 +02:00
Marcos García
cf1d269f15
Avoid warnings
2013-06-01 16:11:45 +02:00
Laurent Destailleur
5bba5782a4
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-29 21:22:27 +02:00
Laurent Destailleur
1cb33c43bd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/agenda.lib.php
htdocs/product/liste.php
2013-05-29 01:30:36 +02:00
Laurent Destailleur
2cac1f4c9c
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2013-05-25 18:14:15 +02:00
Florian Henry
5b02a3a67c
Fix search product if multilingue
2013-05-24 22:44:26 +02:00
Florian Henry
0a041a7705
Fix multilangue search product list
2013-05-24 22:39:28 +02:00
Marcos García
edfcfb9bbd
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop
...
Conflicts:
htdocs/admin/commande.php
htdocs/admin/expedition.php
htdocs/admin/facture.php
htdocs/admin/fichinter.php
htdocs/admin/livraison.php
htdocs/admin/supplier_invoice.php
htdocs/admin/supplier_order.php
htdocs/societe/admin/societe.php
2013-05-08 15:37:41 +02:00
Laurent Destailleur
fc158d1e10
Merge pull request #934 from KreizIT/develop
...
Fix invalid permission test when deleting services
2013-05-08 00:11:01 -07:00
Marcos García
54a2d3ca72
Corrected translations of info tooltips in document models description
2013-05-07 22:04:08 +02:00
Cedric GROSS
d1c1cf6bc0
Fix invalid permission test when deleting services
2013-05-07 12:07:06 +02:00
Laurent Destailleur
fc0d5abd14
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/fiche-stat.php
htdocs/contact/class/contact.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modSociete.class.php
htdocs/projet/fiche.php
test/phpunit/FilesLibTest.php
2013-05-03 00:15:02 +02:00
Laurent Destailleur
3a531f048a
Merge pull request #906 from grandoc/3.3
...
fix: undefined property
2013-05-02 10:42:13 -07:00
fhenry
440912a4d3
fix [ bug #827 ] AJAX search does not respect multiprice level
2013-04-30 21:35:27 +02:00
Grand Philippe
114ace6499
fix: undefined property
2013-04-30 15:22:39 +02:00
Laurent Destailleur
e29f533b7a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce
Uniformize code for liste_array
...
Fix visibility of elements into product page (manage external users)
2013-04-27 15:08:35 +02:00
fhenry
5dce16863f
Review delete extrafield in delete class method
2013-04-26 17:20:21 +02:00
fhenry
a06581771c
Reveiw extrafield for womplaiance with wiki
...
http://wiki.dolibarr.org/index.php/Extrafields
2013-04-26 10:29:14 +02:00
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
fhenry
0513cbe655
Add debug log (dol_syslog)
2013-04-23 11:12:07 +02:00
Laurent Destailleur
6adaf2fa8f
Fix: Pb when using virtual products inside virtual products
2013-04-22 13:02:10 +02:00
Laurent Destailleur
c87c7703cd
Qual: Make code simpler.
2013-04-22 13:01:22 +02:00
Laurent Destailleur
5b4b058399
Perf: Minor perf enhancement
2013-04-22 12:30:52 +02:00
Laurent Destailleur
5cbb0359aa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd
Fix: Some translation change to have things more clear.
2013-04-22 10:33:06 +02:00
Laurent Destailleur
7ff2e559aa
Fix: PGsql compatibility
2013-04-22 01:59:52 +02:00
Laurent Destailleur
1f0adfaff5
Can remove an element from category when on category view.
2013-04-21 23:44:33 +02:00
fhenry
75194ddb57
Ifo user visibility and maxlength product label regarding db column size
2013-04-20 07:05:31 +02:00
fhenry
e2d0d0d414
Fix fix as Eldy wish it
2013-04-20 00:10:20 +02:00
Laurent Destailleur
af6f075b5c
Qual: Better error management.
...
Qual: Uniformize code for canvas
2013-04-09 23:56:52 +02:00
Laurent Destailleur
7ebd24daea
Merge pull request #805 from zedzedtop/develop
...
Develop
2013-04-05 13:28:58 -07:00
Laurent Destailleur
76910d4159
Look: Start to use div to render actions buttons
2013-04-03 18:37:54 +02:00
jfefe
cf6f4405cb
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
...
Conflicts:
htdocs/comm/propal.php
2013-04-01 19:44:55 +02:00
jfefe
7ca7c552c0
Use new function to show extrafields on products
2013-04-01 18:59:41 +02:00
Laurent Destailleur
f52fe71018
Fix: Bad div closing
2013-03-30 19:40:52 +01:00
jfefe
3fe1b26136
New method to CommonObject to display extrafields data output
...
Try for product
2013-03-30 17:43:21 +01:00
jfefe
bd4e62a5e7
Implement extrafields : calendar on date type and new separator type
2013-03-30 16:58:49 +01:00
Grand Philippe
671837bfcc
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-30 14:32:17 +01:00
Grand Philippe
ee7490a30a
fix : language error
2013-03-30 14:31:10 +01:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Sébastien de Chateauvieux
eda6187982
TVA NPR : can use * in tva when set supplier price
2013-03-28 09:30:42 +04:00
Sébastien de Chateauvieux
aaaa5242d6
TVA NP : update price calculation
2013-03-25 17:42:48 +04:00
Laurent Destailleur
fcef334122
Merge pull request #748 from GPCsolutions/naturalsearch
...
Natural search
2013-03-16 07:38:55 -07:00
Laurent Destailleur
55f9879a6c
Replace table with div. Prepare work for android application.
2013-03-16 14:53:15 +01:00
Raphaël Doursenaud
86dab44c98
Added natural search to products
2013-03-15 15:33:49 +01:00
Laurent Destailleur
fc3483a4bb
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/webservices/server_user.php
2013-03-12 14:55:13 +01:00
Grand Philippe
dd248e9d58
fix : dyslexia
2013-03-11 17:19:03 +01:00
Laurent Destailleur
418eeef8b4
Fix: Ton of bugs into renaming fields
2013-03-09 16:19:15 +01:00
Laurent Destailleur
dacba745c5
Merge pull request #694 from grandoc/develop
...
english language standardization
2013-02-26 11:03:16 -08:00
Maxime Kohlhaas
0de4fa09f1
Product price : updated always with HT base type after product import
2013-02-26 12:52:37 +01:00
Grand Philippe
44dee53350
english language standardization
2013-02-25 18:21:12 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847
english language standardization
2013-02-25 09:17:38 +01:00
Grand Philippe
86de772b31
english language standardization
2013-02-24 17:08:52 +01:00
Grand Philippe
88458ca466
english standardization
2013-02-23 10:18:05 +01:00
simnandez
e1683f5f22
Fix: Pagination at bottom not work correctly with filters applied
2013-02-22 08:57:28 +01:00
simnandez
8fd3d9375d
Fix: Pagination at bottom not work correctly with filters applied
2013-02-22 08:56:07 +01:00
simnandez
723c46ec42
Fix: Pagination at bottom not work correctly with filters applied
2013-02-21 14:29:06 +01:00
Laurent Destailleur
bc505c98a0
Test to avoid infinite loop
2013-02-19 21:10:31 +01:00
Laurent Destailleur
aff919fd10
Fix: Bad test
2013-02-17 12:45:46 +01:00
BENKE Charles
f847558363
Update htdocs/product/class/product.class.php
...
fetch_prod_arbo / recursive call of the child product test
2013-02-15 07:21:10 +01:00
BENKE Charles
f084bbbb19
Update htdocs/product/class/product.class.php
...
bug on list of childs of product
if two products have the same label, the list display only one line
2013-02-08 21:21:25 +01:00
Laurent Destailleur
56e11e52fa
New: hookmanager class is used frequently and is a factory object, so we
...
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Laurent Destailleur
abb6daf2dc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d
Fix: Removed warnings
2013-01-19 14:32:37 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
92723bd6fe
Fix: broken features
2013-01-15 11:41:12 +01:00
Regis Houssin
8a6bc63127
Fix: uniformize code
2013-01-15 11:23:24 +01:00
Regis Houssin
787d3bd6a9
Fix: use event method
2013-01-15 11:00:32 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Laurent Destailleur
96416735df
Fix: [ bug #618 ] External accounts can access confidential informations
...
(a lot)
2013-01-02 18:43:59 +01:00
Laurent Destailleur
815f43904d
Fix: Warning if setup not complete
2012-12-30 21:56:53 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Regis Houssin
65090c582d
Fix: checkstyle
2012-12-15 11:39:47 +01:00
Laurent Destailleur
f4459ee1f1
Fix: Regression detected by PHPUnit
2012-12-10 19:06:59 +01:00
fhenry
1d6bc23f4d
- Uniformize Extrafield deletion for adherent,user,product,societe by
...
using commonobject method
- Add convertion of tms timestamp special case in mysql for pgsql
2012-12-08 14:23:52 +01:00
Regis Houssin
3d4621327c
Fix: EOL !! tant que ce problème sera présent, les risques de problèmes
...
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
2012-12-05 11:18:45 +01:00
Maxime Kohlhaas
954a578ebd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
...
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-12-05 09:10:55 +01:00
simnandez
d8651ca830
Trad: Add missing margins translations
2012-12-01 15:47:28 +01:00
simnandez
af304638c8
Fix: Add to areas not working if we navigate with shownavref
2012-12-01 15:47:16 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
Maxime Kohlhaas
69fa1e9d10
Fix : replace PRODUIT_PRICE_BY_QTY by PRODUIT_CUSTOMER_PRICES_BY_QTY
2012-12-01 14:38:59 +01:00
Maxime Kohlhaas
e45438994c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
...
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-12-01 14:36:51 +01:00
Laurent Destailleur
d30b74e69e
Merge pull request #508 from simnandez/develop
...
Fix: Add to areas not working if we navigate with shownavref
2012-12-01 02:56:11 -08:00
simnandez
dda12c3d70
Trad: Add missing margins translations
2012-11-30 17:58:12 +01:00
simnandez
dbf1a727be
Fix: Add to areas not working if we navigate with shownavref
2012-11-30 16:20:01 +01:00
Laurent Destailleur
da9ac187dd
Merge pull request #493 from atm-maxime/mko545
...
Qual : clean unused code
2012-11-27 11:08:01 -08:00
Laurent Destailleur
3de396afa6
Fix: Class not found
2012-11-25 20:42:53 +01:00
Maxime Kohlhaas
5c9058e688
Qual : clean unused code
2012-11-22 21:56:06 +01:00
Maxime Kohlhaas
ec37a5e005
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-11-19 13:31:23 +01:00
Regis Houssin
8908f977b8
Fix: converting line delimiters !!!
2012-11-14 11:31:08 +01:00
Maxime Kohlhaas
667c8cffae
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-11-14 11:02:35 +01:00
Regis Houssin
54d4661769
Fix: missing action type for hookmanager
2012-11-10 16:08:26 +01:00
Regis Houssin
57cce6f517
Fix: missing global
2012-11-09 19:34:05 +01:00
Regis Houssin
0e0582c16f
Fix: avoid conflicts with external module if triggers used
2012-11-09 19:23:46 +01:00
Maxime Kohlhaas
7035ec42f1
Task # 559 : Modifications to store unitprice as in supplier prices
2012-11-07 00:38:53 +01:00
Maxime Kohlhaas
5586897f70
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-11-06 23:07:40 +01:00
simnandez
353c932e11
Fix: if no results do not charge data
2012-11-06 12:33:35 +01:00
Laurent Destailleur
7f2c6dc6eb
Only code comments
2012-11-03 14:44:06 +01:00
Regis Houssin
a108abddda
Fix: disabled ajax for the moment
2012-11-01 10:48:48 +01:00
Maxime Kohlhaas
bed17951b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-10-27 15:59:40 +02:00
Laurent Destailleur
833ada4732
Merge pull request #465 from simnandez/develop
...
Fix: [ bug #579 ] Multi-Company and imports
2012-10-26 11:00:52 -07:00
simnandez
7aec227694
New: More import options. Products stocks
2012-10-26 17:52:53 +02:00
Maxime Kohlhaas
0f1617c31d
Task 559 : add use of price by qty in product selection (select and ajax search)
2012-10-26 01:00:03 +02:00
Laurent Destailleur
cbff238cbd
New: Support property "required" for extra fields.
2012-10-25 16:23:58 +02:00
Maxime Kohlhaas
03cf96ed31
Task # 559 : add discount by qty as done in supplier prices
2012-10-25 08:18:59 +02:00
Maxime Kohlhaas
2ff77bb2f1
Task # 559 : no need for a max quantity
2012-10-24 17:18:11 +02:00
Maxime Kohlhaas
8ba55f49f1
Task # 559 : start of price by quantity management
2012-10-22 17:47:15 +02:00
Laurent Destailleur
0152e226c1
Fix: Use correct translation of fields
2012-10-18 13:25:32 +02:00
Regis Houssin
d705995a49
Fix: convert line delimiters
2012-10-18 10:36:53 +02:00
Laurent Destailleur
a41186b4c5
[ bug #70 ] Champ Stock toujours vide dans export produit
2012-10-17 20:30:17 +02:00
Laurent Destailleur
8ff506b120
Sec: Sanitize all params page, sortfield and sortorder
2012-10-13 14:47:46 +02:00
Regis Houssin
478449da37
Fix: convert line delimiters
2012-10-08 20:47:10 +02:00
Regis Houssin
7f7676d357
Fix: uniformize variable name
2012-10-08 20:44:12 +02:00
Laurent Destailleur
430b63f4e1
Fix: Bad message
2012-10-06 22:54:23 +02:00
Laurent Destailleur
4789b5e2d1
Fix: Usage of specific mysql function is forbidden
2012-10-06 22:46:54 +02:00
Maxime Kohlhaas
0e17c7c063
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186
2012-10-04 15:36:47 +02:00
Maxime Kohlhaas
12128a6226
Task # 186 : Stock calculation on product, migration + update product
2012-10-04 15:25:34 +02:00
Laurent Destailleur
a821d6cafe
Fix: We use dolibarr_details as type of DolEditor here, because we
...
must not accept images as description is included into PDF and not
accepted by TCPDF.
2012-10-03 14:52:01 +02:00
Laurent Destailleur
1d9e77a53d
Fix: We use dolibarr_details as type of DolEditor here, because we must
...
not accept images as description is included into PDF and not accepted
by TCPDF.
2012-10-03 14:49:51 +02:00
Laurent Destailleur
079ea61582
Fix: W3C
2012-10-02 00:36:23 +02:00
Laurent Destailleur
082ee53dae
Fix: Miscellaneous fix in supplier product input
2012-10-02 00:30:23 +02:00
Maxime Kohlhaas
1d21f24fa7
Task # 559 : Add possibility to define a discount for min quantity on supplier product prices
2012-10-01 11:25:17 +02:00
Laurent Destailleur
9bbe0e6b1c
Qual: Mutuamize codeby using tpl.
...
New: Support unique field for extrafields
2012-09-22 20:27:06 +02:00
Regis Houssin
d58c106f66
Fix: convert line delimiters !!!
2012-09-19 17:53:09 +02:00
Laurent Destailleur
0b4df34091
Fix: Blank page when renaming product ref
2012-09-19 14:16:29 +02:00
Laurent Destailleur
0e76bd7ac6
Fix: Blank page when renaming a product ref
2012-09-19 14:11:01 +02:00
Laurent Destailleur
1347ecf14e
Qual: Removed warnings
2012-09-19 12:49:58 +02:00
Laurent Destailleur
9ab0653902
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-09-17 01:39:49 +02:00
Laurent Destailleur
3953be53a7
Qual: Mutualize code
...
New: Can use extrafields on contacts/addresses.
2012-09-17 01:39:30 +02:00
Regis Houssin
ada85df649
Fix: wrong permission
2012-09-16 21:12:55 +02:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1
Fix: strict mode hurricane
2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71
Fix: use getDocumentsLink method
2012-09-15 09:02:20 +02:00
Regis Houssin
125f499e82
Fix: dol_htmloutput_events is already call in llxFooter
2012-09-13 16:15:36 +02:00
Regis Houssin
7eef637776
Fix: strict mode killer
2012-09-13 11:52:50 +02:00
Laurent Destailleur
4cc56f0176
New: Extra fields supports more types (now int, string, double, date,
...
datetime)
2012-09-13 10:14:25 +02:00
Regis Houssin
71d5191ff7
Fix: duplicate parameters
2012-09-12 10:46:35 +02:00
Regis Houssin
9058439015
Fix: best practice
2012-09-09 16:17:19 +02:00
Laurent Destailleur
1450ee1978
Merge pull request #375 from marcosgdf/barcode-mini-search
...
Added Copyright and changelog entry
2012-09-09 06:34:26 -07:00
Laurent Destailleur
83cdb2167e
Fix: Use bad parameter name
2012-09-09 15:23:09 +02:00
Marcos García
94090e85db
Added Copyright and changelog entry
2012-09-09 15:12:04 +02:00
Marcos García
33c1fd2a01
Allow to search barcodes in the permanent mini search box
...
Requested by Joaquim in Dolibarr.es forum
http://dolibarr.es/index.php/foro/9-sugerencias/1337-buscador-de-la-izquierda/
2012-09-09 14:43:41 +02:00
Laurent Destailleur
2c2d17b101
Fix: Try a fix to avoid having the hover on array that should not have
...
it.
2012-09-09 13:13:24 +02:00
Regis Houssin
c98e456ba9
Fix: missing <br> and strict mode
2012-09-07 18:16:05 +02:00
Regis Houssin
ee1cf819f7
Fix: mass convert line delimiters
2012-09-07 17:23:16 +02:00
simnandez
a3ecb1203b
New: Add PRODUCT_PRICE_MODIFY trigger
2012-09-05 14:38:16 +02:00
Laurent Destailleur
913b923886
Fix: error report when duplicate product
2012-09-02 15:09:48 +02:00
Marcos García
4209898d20
Lower-cased Header function
2012-08-31 05:58:38 +02:00
Regis Houssin
4a97ea9b7b
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-08-29 17:30:11 +02:00
Regis Houssin
d6918d7a87
Fix: upgrade ckeditor
2012-08-29 16:31:48 +02:00
Laurent Destailleur
87742cb3d8
Qual: Move an admin tools into admin menu.
...
Fix: Fix 7 bugs into the mass vat update tool.
2012-08-29 14:13:13 +02:00
Laurent Destailleur
8a74c928f3
Fix: regression
2012-08-28 23:01:04 +02:00
Laurent Destailleur
80d9fb7134
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-08-27 20:02:42 +02:00
Laurent Destailleur
d0d5891eef
New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes.
2012-08-27 20:02:23 +02:00
Regis Houssin
3e2be54ead
Fix: restore old method
2012-08-27 19:11:44 +02:00
Regis Houssin
07a10d3984
Fix: add compatibility with old static combobox
2012-08-27 17:18:46 +02:00
Laurent Destailleur
9570e03b1e
Qual: Add TODO
2012-08-27 12:07:50 +02:00
Laurent Destailleur
fd00b16b19
Fix: Bad log format
2012-08-26 18:28:59 +02:00
Regis Houssin
d88abe8df0
Fix: use label instead libelle
2012-08-25 12:07:18 +02:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Marcos García
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Marcos García
8639f1a414
Fixed bug #504
...
https://doliforge.org/tracker/?func=detail&aid=504&atid=246&group_id=144
2012-08-19 03:37:37 +02:00
Regis Houssin
5ff8d74d34
Merge pull request #316 from marcosgdf/minor
...
Translated message was generating an incomplete string
2012-08-17 11:15:50 -07:00
Regis Houssin
3438305169
FIXME: with ajax autocompleter, does not see the products that have no
...
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
2012-08-17 15:16:07 +02:00
Marcos García
24c89ddc12
Translated message was generating an incomplete string
2012-08-17 07:05:28 +02:00
Regis Houssin
48efabc8a4
Fix: remove deprecated function and avoid warnings
2012-08-15 09:06:36 +02:00
Maxime Kohlhaas
d0fbca4c37
task # 326 : en_US translations :)
2012-08-09 01:51:45 +02:00
Maxime Kohlhaas
44b84b2177
task # 326 : Add a numbering module to suggest automatically a product ref
2012-08-09 01:41:55 +02:00
Laurent Destailleur
32a1301a92
Fix: Use correct object
2012-08-08 22:11:08 +02:00
Laurent Destailleur
2620abc6a0
Use different class for a and img
2012-08-08 20:46:50 +02:00
Laurent Destailleur
0d346ac1c1
New: A module can add several css and several js.
...
New: Removed lightbox as it is not compatible with GPL.
2012-08-08 20:43:23 +02:00
Regis Houssin
5564421e3f
Fix: update method return $this->error not $this->errors
2012-08-07 12:00:22 +02:00
Regis Houssin
71a4a2b7f9
Fix: dol_htmloutput_events() already loaded in footer
2012-08-07 11:48:28 +02:00
Laurent Destailleur
5d9f16ca20
New: More surface control on stock correction page
2012-08-07 11:33:11 +02:00
Laurent Destailleur
1e28904d56
New: task #185 : Can input amount when correcting stock to recalculate
...
PMP.
2012-08-06 19:41:03 +02:00
Regis Houssin
67d90d9de2
Merge pull request #292 from atm-maxime/mko185
...
Mko185
2012-08-06 10:03:59 -07:00
Maxime Kohlhaas
c2b38e8415
task #185
2012-08-06 18:11:00 +02:00
Regis Houssin
d830041441
Fix: missing object
2012-08-06 17:43:14 +02:00
Maxime Kohlhaas
e8a3af017e
task #185 : Can input HT amount when correcting stock to recalculate PMP
2012-08-06 17:10:55 +02:00
Laurent Destailleur
990da41955
Qual: Removed bad herit
2012-08-05 14:56:20 +02:00
Laurent Destailleur
9fef649a7c
Removed useless file
2012-08-05 14:06:21 +02:00
Regis Houssin
286854bf2c
Fix: [bug #478 ] Can access pages belonging to disabled modules
2012-08-03 11:56:42 +02:00
Regis Houssin
e44fd4885d
Fix: change the last $DB to $db
2012-07-30 18:43:49 +02:00
Marcos García
5a73c32f46
Migrated ClassName to __construct() function
...
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Marcos García
7e0892783a
Removed duplicated translation and modified a line of code as @hregis requested
2012-07-30 08:21:05 +02:00
Marcos García
d1cbf4f944
Fixed BIG es_ES translation problem with donations module
...
Fixed some es_ES and en_US typos
There was a string that wasn't available for translation
2012-07-30 03:18:17 +02:00
Regis Houssin
28851b46c4
Fix: remove duplicate code
2012-07-29 16:44:19 +02:00
Regis Houssin
a64723ea74
Fix: replace with new event message system
2012-07-29 16:11:52 +02:00
Regis Houssin
0aa6694c95
Fix: broken event message
2012-07-29 15:47:24 +02:00
Regis Houssin
eee5653c54
Fix: try to use the new message system
2012-07-29 12:54:19 +02:00
Regis Houssin
77a5ef0b22
Fix: move ajax response in ajax directory
2012-07-29 10:24:42 +02:00
Marcos García
ec36ffd73c
Missing expeditions and stocks BackToList links
2012-07-28 22:14:53 +02:00
Laurent Destailleur
859c6cee97
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-07-28 12:32:06 +02:00
Laurent Destailleur
160997cbbe
Fix: Bad test
2012-07-28 12:31:37 +02:00
Marcos García
a6c8838b8f
Applied patches 9-15
2012-07-27 21:27:03 +02:00
Regis Houssin
20ed6bd5c5
Fix: Bug #460 - Wrong entity assignment when creating a warehouse
2012-07-26 20:52:05 +02:00
Regis Houssin
e3a3dd0454
Fix: it's for margin module
2012-07-25 12:53:02 +02:00
Laurent Destailleur
dce9b96260
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/lib/repair.lib.php
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-07-25 12:20:45 +02:00
Laurent Destailleur
de621f0567
Fix: Restore compatibility. Try to isolate "charges" feature with
...
a condition (i did not understand what it means and goal, i'm afraid
other users should not understand too).
2012-07-25 11:32:48 +02:00
Regis Houssin
c6cd17cf3f
Fix: strict mode... far away
2012-07-24 17:52:46 +02:00
Regis Houssin
d5ff308992
Fix: declare $mesg and $mesgs in main.inc.php
...
Fix: strict mode be back
2012-07-23 20:52:55 +02:00
Regis Houssin
fb23364511
Fix: uniformize code
2012-07-23 16:10:54 +02:00
Regis Houssin
b121a01ef8
Merge pull request #247 from cbattarel/marges
...
Margin module
2012-07-19 10:46:24 -07:00
Christophe Battarel
34132de71d
add charges to supplier prices
2012-07-19 15:36:25 +02:00
Laurent Destailleur
f5b58b6f12
Fix: Missing fields into insert from webservice
2012-07-19 14:26:02 +02:00
Laurent Destailleur
1d89c172d0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-07-18 22:41:06 +02:00
Laurent Destailleur
ba25905926
New: [ task #454 ] Add "No category" into filters on category
...
combo for product list
2012-07-18 00:20:33 +02:00
Laurent Destailleur
9116db986f
Fix: Restore button to edit products. Fix: the template to use for notes is dolibarr_notes.
2012-07-17 19:45:22 +02:00
Laurent Destailleur
d07e68e12f
Fix: Combo list of warehouse not saved.
...
Fix: Validate of shipment in error
when using not predefined products.
2012-07-17 01:22:19 +02:00
Regis Houssin
66b2f630ac
Fix: big avoid strict mode errors
2012-07-09 12:31:21 +02:00
Regis Houssin
887f210618
Fix: avoid warning with php 5.4 and strict mode
2012-07-08 23:22:22 +02:00
Regis Houssin
9fa6f43643
Fix: bad link and uniformize code
2012-07-06 10:22:37 +02:00
Regis Houssin
dfe7b9ecbb
Fix: price field is obsolete
2012-07-06 09:52:20 +02:00
Regis Houssin
454aa69697
Fix: missing images files filter
2012-07-03 21:13:09 +02:00
Regis Houssin
6f1651309e
Fix: global converting lines delimiter
2012-07-02 19:30:37 +02:00
Regis Houssin
c69fa495fa
Fix: compatibility with multicompany
2012-07-02 15:42:35 +02:00
Laurent Destailleur
a30b366b2b
Fix: Can't modifiy accountancy code sell
2012-06-28 20:01:50 +02:00
Laurent Destailleur
6f8ad124a1
New: Can correct stock of a warehouse from warehouse card.
2012-06-15 02:16:35 +02:00
Laurent Destailleur
fd0450457d
New: Can insert links into elements lines. Also reported into PDF.
2012-06-09 13:16:55 +02:00
Laurent Destailleur
1022c73c24
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-06-08 22:17:14 +02:00
Regis Houssin
f4135d3758
Fix: delete or rename a document product dir
2012-06-08 21:40:27 +02:00
Regis Houssin
355cb988b7
Fix: missing oldcopy during update
2012-06-08 21:40:15 +02:00
Laurent Destailleur
62766288c8
Fix: Another fix for var not initialized
2012-06-08 21:39:44 +02:00
Laurent Destailleur
59e39b5d91
Fix: A lot of pb into javascript. Javascripts code for same feature was
...
not inserted always at same place (sometinmes at low level, and
sometimes at high level). This was creating conflict into javascript.
2012-06-08 21:33:12 +02:00
Regis Houssin
e6c6d6cf84
Fix: avoid warning
2012-06-08 18:17:03 +02:00
Laurent Destailleur
f575dd4ae5
Fix: bad error management
2012-06-06 23:06:17 +02:00
Laurent Destailleur
c2db3265ec
Fix: Regression with quot management. Try a better fix.
2012-05-30 12:43:23 +02:00
Regis Houssin
a5b0de15ac
Fix: can't delete a files with quote
2012-05-30 08:30:25 +02:00
Regis Houssin
a486da1b0e
Fix: restore files for template engine
2012-05-30 07:43:06 +02:00
Laurent Destailleur
3c98daaf09
More fix for canvas features
2012-05-30 03:46:06 +02:00
Laurent Destailleur
8481af9ee4
Fix: Try to fix several bugs into canvas feature.
2012-05-30 03:02:44 +02:00
Laurent Destailleur
3fc3292142
Fix: delete of documents is done by page of element, not by the view
...
wrapper.
2012-05-29 23:50:13 +02:00
Regis Houssin
516be43404
Fix: jquery fileupload broken feature
2012-05-25 20:56:05 +02:00
Laurent Destailleur
6b2faf02d9
Checkstyle
2012-05-23 23:34:00 +02:00
Laurent Destailleur
82dda362c5
Fix: [ bug #409 ] List of vat rates for supplier prices must use the
...
seller country.
2012-05-23 10:50:38 +02:00
Laurent Destailleur
dc16085d57
Fix: No hard coded precision. Second param must be 'MU' (we want a
...
unit price so 'MU'. If unit price was on 4 decimal, we must keep 4
decimals once vat rate was changed)
2012-05-23 02:31:38 +02:00
Regis Houssin
8eb73aaa33
Fix: convert line delimiters
2012-05-22 19:26:33 +02:00
Regis Houssin
8f3ead5cfc
Fix: round ttc with 2 decimal
2012-05-22 19:25:51 +02:00
Regis Houssin
d7d26b9375
Fix: bad sql result name
2012-05-22 19:11:41 +02:00
Regis Houssin
e8fd068cb0
Fix: reinstanciate object
2012-05-22 18:48:56 +02:00
Regis Houssin
01f1674231
New: add product admin page for mass conversion
2012-05-22 18:35:14 +02:00
Laurent Destailleur
161846be77
Fix: [ bug #397 ] Product VAT is not coming from buying price
2012-05-08 22:10:07 +02:00
Laurent Destailleur
a772fff5ed
Fix: update price for pgsql
2012-05-08 21:59:02 +02:00
Regis Houssin
3bc9e378ab
Fix: [Bug #388 ] Can't modify products after moving with arrows
2012-05-05 09:20:01 +02:00
Regis Houssin
73487a6aec
Fix: replace mktime() by dol_now()
2012-04-30 15:01:25 +02:00
simnandez
90ecb566d8
Fix: [ bug #368 ] Product list
2012-04-20 09:32:24 +02:00
Laurent Destailleur
9114fec4ed
Doxygen
2012-04-16 12:01:32 +02:00
Regis Houssin
98f7a189d1
Fix: add backward compatibility
2012-04-06 23:26:04 +02:00
Regis Houssin
94788e2ccb
Fix: compatibility with multicompany sharings
...
use new $conf->product->dir_output[$object->entity] instead
$conf->product->dir_output
2012-04-06 22:41:33 +02:00
Laurent Destailleur
4cc13064db
Fix: W3C
2012-04-05 21:15:09 +02:00
Regis Houssin
0a9882bef8
Merge pull request #155 from defrance69/develop
...
Update htdocs/product/index.php
2012-04-05 09:54:26 -07:00
defrance69
8cfed3ff3f
Update htdocs/product/index.php
2012-04-05 14:01:15 +03:00
simnandez
a0cae7709c
Fix: Sanitize data
2012-03-29 09:54:48 +01:00
Regis Houssin
3c794967c3
Fix: multiple avoid warning with php strict mode
2012-03-23 17:18:33 +01:00
Laurent Destailleur
88a1a0f06d
fix: Checkstyle
2012-03-17 14:03:31 +01:00
Regis Houssin
e8ec5f5ad7
New: add vat rate in supplier price
...
New: add events system in jquery combobox
2012-03-15 16:52:18 +01:00
Regis Houssin
993b5eefaf
Fix: wrong blank space for jquery combobox
...
Fix: uniformize code
2012-03-15 10:14:54 +01:00
Laurent Destailleur
b5fc41fadc
Fix: Removed a lot of checkstyle warnings
2012-03-11 22:08:46 +01:00
Laurent Destailleur
aea97075f1
Fix: Fix some bugs (phpunit is now ok with pgsql too)
2012-03-11 21:45:17 +01:00
Regis Houssin
a4863ffa89
Fix: missing compatibility
2012-03-04 18:38:28 +01:00
Laurent Destailleur
06dc5aa9dd
Fix: Do not loose data from post if it fails
2012-03-04 13:07:36 +01:00
Regis Houssin
68ce569d05
Fix: compatibility with edit in place
...
Qual: use generic function and remove unused
Todo: Type of product combobox is not compatible with edit in place
2012-03-04 09:43:56 +01:00
Laurent Destailleur
00b7ad4a78
New: Can convert a product/service into service/product.
2012-03-04 01:41:36 +01:00
Laurent Destailleur
e45bbb622a
Fix: Some fix and uniformize code for extra parameters.
2012-03-04 01:09:39 +01:00
Laurent Destailleur
f5c551d725
New: Can use personalized fields of products/services.
2012-03-03 19:02:44 +01:00
Laurent Destailleur
fb6aad19e5
New: Import wizard can import personalized fields
2012-03-03 16:33:38 +01:00
Regis Houssin
9301def08d
Fix: rename method
2012-03-02 15:03:14 +01:00
Regis Houssin
addc8db9e7
Fix: rename hooks
2012-03-01 16:51:59 +01:00
FHenry
adb2006505
Merge remote-tracking branch 'origin/develop' into develop
2012-03-01 14:32:07 +01:00
Laurent Destailleur
e0d8fae676
Fix: pgsql
2012-03-01 09:40:05 +01:00
Laurent Destailleur
e0f7637bb3
Fix: Restore barcode management
2012-02-29 22:54:34 +01:00
Laurent Destailleur
55904f7f37
New: Test on browser version during install step.
...
Mutualize code to detect browser version.
2012-02-29 19:41:12 +01:00
FHenry
16408b6310
Merge remote branch 'origin/develop' into develop
2012-02-29 14:32:33 +01:00
FHenry
59f424bde3
add hook for select produit
2012-02-29 14:32:22 +01:00
Laurent Destailleur
5e32fc70ad
Fix: action must always be provided as value can be change during actions
2012-02-28 16:48:18 +01:00
Laurent Destailleur
1645ddbe47
Sec: Sanitize all input for ids.
2012-02-27 22:26:22 +01:00
Laurent Destailleur
9270e4603b
Fix: Bad filters on stock movement list
2012-02-26 13:32:16 +01:00
Laurent Destailleur
489c00fa9f
Fix: Trigger for delete must be done in opposite order than trigger for
...
create.
2012-02-22 12:37:39 +01:00
Regis Houssin
e5c0a99584
Fix: for multi-company
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/html.form.class.php
2012-02-21 10:26:38 +01:00
Laurent Destailleur
58d1a042a5
Fix: print select_societe was wrong as it contains already print
...
instructions. Use select_company instead.
2012-02-20 12:41:12 +01:00
Laurent Destailleur
c4b845d60a
Qual: Removed deprecated function name.
2012-02-19 18:34:22 +01:00
Regis Houssin
70bd56bea8
Fix: remove alias
2012-02-16 16:26:55 +01:00
Laurent Destailleur
1de2af42b4
Fix: Translation
2012-02-15 21:10:33 +01:00
Regis Houssin
74b69c6659
Fix: add multicompany products sharing
2012-02-11 18:45:36 +08:00
Regis Houssin
cd3452d71d
Fix: multicompany sharings and uniformize code
2012-02-11 10:18:09 +01:00
Regis Houssin
f0d2823edf
Fix: avoid foreach warning
2012-02-06 18:59:07 +01:00
Laurent Destailleur
6cb0685b6f
Qual: Uniformize hook names. All hooks to add information on
...
create/update/view cards are called fomrObjectOptions instead of
sometine formObjectOptions, sometimes showInputFields, sometimes
showOutputFields.
2012-02-06 17:18:19 +01:00
Regis Houssin
c6e4206907
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-01 11:33:11 +01:00
Regis Houssin
4431510ce4
Fix: use entity field of object
2012-02-01 11:32:55 +01:00
Laurent Destailleur
ed4a0742c8
Add a test to be sure module is on
2012-01-31 00:51:52 +01:00
Laurent Destailleur
8c934d3dde
Rename custom code into customs code
2012-01-30 20:08:11 +01:00
Laurent Destailleur
f3a966a313
Fix: Missing name
2012-01-29 23:24:47 +01:00
Laurent Destailleur
cb37a8475a
Fix: Can edit price
2012-01-29 23:07:44 +01:00
Laurent Destailleur
bacf2003f1
Checkstyle
2012-01-22 21:17:02 +01:00
Laurent Destailleur
7c8cda5de3
Update package
2012-01-19 20:43:47 +01:00
Christophe Battarel
b07dae557e
correction bug traduction produit : si le navigateur n'était pas dans la langue du user, une traduction était créée en + dans la langue du navigateur et le front-end basculait dans la langue du navigateur (parce que le champ du formulaire s'appelait lang; je l'ai renommé en translang pour corriger le problème)
2012-01-18 11:13:34 +01:00
Christophe Battarel
6a90298af0
affiche libellé produit dans la langue du client en plus de la description (variable de conf renommée en PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE
2012-01-16 17:12:29 +01:00
Christophe Battarel
5524d42ddb
ajout commentaires entete oubliés sur ajout description produit dans la langue du client
2012-01-16 10:35:36 +01:00
Regis Houssin
288e9deed3
Fix: trigger problem
2012-01-14 20:23:47 +01:00
Regis Houssin
9fe45c4f4f
Fix: uniform code
2012-01-13 17:46:15 +01:00
Christophe Battarel
69c9edbeb3
ajoute la possibilité de visualiser la description des produits dans la langue du client lors de l'jout de lignes dans les commandes/propales/factures
2012-01-13 16:53:28 +01:00
Regis Houssin
9339119455
New: use getEntity() instead $conf->entity
2012-01-11 21:16:10 +08:00
Regis Houssin
cb286a2449
New: add shareds thirparties between entities
2012-01-11 00:19:57 +08:00
Regis Houssin
f7c61369d4
Fix: test limits with vat rates of current country
...
Fix: uniform code
2012-01-08 10:53:05 +01:00
Laurent Destailleur
3f8d2cbef8
Qual: Remove checkstyle warnings
2012-01-04 21:23:50 +01:00
Laurent Destailleur
16c6dd3c95
Doxygen
2012-01-04 13:54:07 +01:00
Laurent Destailleur
c2348ef600
Uniformize field country_id, country_code, country
2011-12-29 18:07:41 +01:00
Regis Houssin
f2bfaa729a
Fix: more explicit and uniform code
2011-12-28 09:26:36 +01:00
simnandez
c9ea8a1867
Qual: Uniformize code
2011-12-22 16:36:01 +01:00
Laurent Destailleur
aa2a45db87
New: Add a tab info for social contributions
2011-12-21 21:14:10 +01:00
simnandez
565f390d14
Qual: Uniformize code
2011-12-19 18:24:49 +01:00
Regis Houssin
5f02432d90
Fix: add possibility to force date of stock movement
2011-12-18 20:59:05 +01:00
Laurent Destailleur
1aa75b847b
New: dol_trunc has an option to make "exact" truncation (without adding
...
... if truncation is done).
2011-12-17 16:44:48 +01:00
Laurent Destailleur
cda132ea8c
Qual: Some change to have graph lib able to use img disk generation
...
libraries like javascript libraries.
2011-12-17 15:55:49 +01:00
Laurent Destailleur
8fb4108163
Qual: childelement is a protected property
2011-12-07 19:22:12 +01:00
Laurent Destailleur
66856fee75
New: show thirdparty barcode on main tab.
2011-12-07 15:06:29 +01:00
Laurent Destailleur
740c24e991
New: barcode is now visible on main tab.
2011-12-07 12:58:39 +01:00
Laurent Destailleur
b52fc32853
Fix: fix not initialized variables
2011-12-05 19:41:38 +01:00
Regis Houssin
98c60c1412
Fix: preventing XSS injections and uniform code
2011-11-27 18:44:27 +01:00
Regis Houssin
00ffbd5e90
Fix: change the last database prefix
2011-11-23 21:25:02 +01:00
Laurent Destailleur
839781dfbe
Qual: Removed a TODO by renaming all ->monnaie into ->currency
2011-11-23 14:55:36 +01:00
Laurent Destailleur
1770a46519
Qual: Removed tons of warning
2011-11-22 14:00:03 +01:00
