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
