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
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
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