2
0
forked from Wavyzz/dolibarr
Commit Graph

74 Commits

Author SHA1 Message Date
Laurent Destailleur
d0a15d32b2 Clean language files 2016-06-18 19:48:58 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
Laurent Destailleur
ccba65fe74 Clean dead code 2016-06-09 22:30:50 +02:00
novalore
1227ee5eb6 Miscellaneous typos and errors in en_US lang files 2016-06-04 00:14:56 +02:00
Laurent Destailleur
0d6546e18e NEW Add an explanation message on shipment page to explain you can't
make shipment if order is not validated
2016-02-25 18:18:33 +01:00
Laurent Destailleur
a95240e33d FIX Some troubles into weight and volume calculation when unit differs.
NEW Introduce a function showDimensionInBestUnit
2016-02-25 13:46:38 +01:00
cla
1ebe6fb9b5 UPDATE:
sendings EN_US lang file
2015-12-16 16:21:05 +01:00
fappels
e9be3d19f4 Fix migration - remove default for text field
remove default for user_param value text field
lang typo
2015-11-16 21:24:08 +01:00
Laurent Destailleur
d408193657 Fix: When stock is empty, no information was visible to explain why
create button does not work.
2015-08-14 20:37:20 +02:00
Laurent Destailleur
8690b5e70e FIX #3173 Overlapping of shipment ref 2015-07-12 16:22:06 +02:00
Francis Appels
308ee40134 Fix Lang part2
Fix lang in en_us
2015-04-18 18:53:25 +02:00
Laurent Destailleur
9a604fa0bc Fix grammar 2015-04-15 17:55:59 +02:00
frederic34
19540b14b5 Add last shipments to company card 2015-03-25 16:38:18 +01:00
Laurent Destailleur
23562a01ab Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang
2015-02-16 20:59:04 +01:00
Laurent Destailleur
1e78d0e8d4 New: Introduce hidden option
STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.
2015-02-16 20:46:54 +01:00
Laurent Destailleur
c727e2b8ec Fix bad translation
Conflicts:
	htdocs/product/stock/product.php
2015-02-12 15:29:21 +01:00
Laurent Destailleur
b49c8f84b6 Fix bad translation 2015-02-12 15:22:04 +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
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
Laurent Destailleur
083cf06908 Fixed: Tracking number restored on PDF shipments
Fixed: Translation
2015-01-23 18:33:33 +01:00
frederic34
77f1e587e6 Some translations 2014-11-01 22:08:18 +01:00
frederic34
f23f16da86 Try to improve stock display for all stock increase/decrease options 2014-11-01 21:38:50 +01:00
Francis Appels
840a98d8ac Expedition lines from same orderline merged.
When there are more expedition lines from same orderline key, merge them
and get source warehouses. Usefull future possibility for creating
shippinglines with same products from multiple warehouses.
@KreizIT also changed some batch related items.
2014-10-03 12:20:02 +02:00
Laurent Destailleur
3f4978d786 Fix: Translation 2014-08-15 23:34:48 +02:00
Raphaël Doursenaud
e07e86b824 Deduplicated lines of the reference language files
Used the new deduplicatefilelinesrecursively.sh script
2014-03-27 12:04:03 +01:00
Laurent Destailleur
086eb125bf Qual: Removed no more required translation entry UTF8 2013-10-23 10:34:48 +02:00
Laurent Destailleur
072247f1c8 Fix: Use correct translation key 2013-09-25 19:07:25 +02:00
Laurent Destailleur
186d5ccad1 Uniformize code and look and file for shipment statistics page. This
remove a TODO and clean code.
2013-07-25 15:02:40 +02:00
Maxime Kohlhaas
fc8805f2ca Added missing trad on shipment + display calculated weight after true weight 2013-07-19 16:52:58 +02:00
Laurent Destailleur
d8cef10ea3 Make comment generic for all files 2013-05-27 10:38:50 +02:00
eldy
1d09e122c0 Some debug with pgsql 2013-03-17 14:28:57 +01:00
Laurent Destailleur
6512fd90a9 New: Can export customer shipments. 2012-11-18 15:24:01 +01:00
Regis Houssin
4a0dad9524 Fix: missing shipping linked object box 2012-07-02 22:41:45 +02:00
simnandez
7e02e3faf6 New: [ task #156 ] Create an invoice from a delivery receipt 2012-03-13 17:28:55 +01:00
Laurent Destailleur
f9dbb35628 Update trans 2012-01-22 13:11:15 +01:00
Laurent Destailleur
37cf63870f New: Add menu new shipment 2011-08-21 11:00:43 +00:00
Regis Houssin
976c74ac87 Fix: uniformize code 2011-06-10 14:28:23 +00:00
Regis Houssin
9e187c3700 Fix: trad 2011-06-04 13:28:27 +00:00
Regis Houssin
5f6ac1374c New: best method for linked object with actioncomm
New: add action "shipping send by mail"
2011-06-04 13:12:44 +00:00
Juanjo Menent
08114f30d9 Task #10577: Works with shipments 2011-02-20 00:20:45 +00:00
Laurent Destailleur
515773c2b6 Trad 2010-08-26 12:19:32 +00:00
Laurent Destailleur
cd7eb850d4 Fix: Trad 2010-07-25 20:03:09 +00:00
Laurent Destailleur
87af5f13f4 Fix: Better translation 2010-07-13 19:38:39 +00:00
Laurent Destailleur
b1c8b95ea3 Trad 2010-07-11 19:33:54 +00:00
Philippe Grand
e8db8b2755 Some spelling changes 2010-06-05 13:27:11 +00:00
Laurent Destailleur
757f9491e1 Fix: A lot of fixes on delivery date 2010-05-12 23:03:33 +00:00
Philippe Grand
a958d47b92 some spelling changes 2010-03-20 22:35:57 +00:00
Laurent Destailleur
3ef86dedec Qual: Translation of status must be in the "view" functions. 2009-12-17 15:52:37 +00:00
Laurent Destailleur
5e977feb5e Fix translations 2009-10-28 20:37:06 +00:00
Laurent Destailleur
01af1c5bf8 New: Add ref to linked objects on PDF 2009-06-04 20:29:45 +00:00