Laurent Destailleur
fd7aea9779
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-31 15:21:38 +01:00
Laurent Destailleur
18e5f8dea6
Fix: Bad detection of space left
2012-10-31 15:21:21 +01:00
Laurent Destailleur
b619437377
Merge pull request #469 from camlafit/develop
...
Return Human readable date product
2012-10-31 07:13:46 -07:00
Laurent Destailleur
13ef8491b7
Fix: Error management
2012-10-31 15:09:42 +01:00
Laurent Destailleur
68bf51c8dd
Qual: Uniformize PDF code
2012-10-31 14:55:35 +01:00
cam.lafit
a3f0ce9063
Merge all substitutions on same loop (Invoicing with odt)
...
* It's not necessary to have a redondant loop to substitute all variables
2012-10-31 14:49:27 +01:00
cam.lafit
7b8b015569
Return Human readable date product
...
* By default date with mktime format, not great on Invoice
2012-10-31 14:49:27 +01:00
Laurent Destailleur
f6d9b2abe3
New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT,
...
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
2012-10-31 13:48:59 +01:00
Laurent Destailleur
dbfe71922e
Fix: Avoid warnings
2012-10-31 12:35:52 +01:00
Maxime Kohlhaas
240d310a7f
Fix : shipment PDF rouget wasn't using the right var to access related internal contact
2012-10-31 08:57:56 +01:00
Laurent Destailleur
64d8d558a5
Qual: Uniformize pdf code
2012-10-31 02:29:45 +01:00
Laurent Destailleur
42d2a0a2d1
Fix: Bad position of columns. Works with all paper format now.
2012-10-30 19:24:31 +01:00
Laurent Destailleur
08724f5ec0
Qual: Some changes to use more efficiently bottom of page when there is
...
several pages (we don't keep space for total on all pages, but only last
one)
2012-10-30 18:26:04 +01:00
Laurent Destailleur
54852e29e7
Qual: Removed duplicate template (nearly no difference between sirroco
...
and typhon, so no need to keep them both).
2012-10-30 17:59:16 +01:00
Laurent Destailleur
ea90571925
Fix: The bottom margin is already included into heightforfooter
...
This provide 1cm more for product description.
2012-10-30 17:57:32 +01:00
Laurent Destailleur
6f9c9fcd55
Fix: Free text overlap data when not on last page.
2012-10-30 13:11:17 +01:00
Laurent Destailleur
e013fa01a7
Fix: Revert direction of option (this information is a legal issue for
...
most countries). Also, i removed the mandatory test, this is required
for invoices, not proposals.
So now, there is no need to hide by default because test on invoice
setup has been removed, so we can show by default (if defined) and use
option to force to hide if we want.
2012-10-29 11:38:32 +01:00
Laurent Destailleur
9d4471dd67
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
2012-10-28 19:53:14 +01:00
Laurent Destailleur
3738d3e6be
Fix: Better fix for import when field is computed by a function
2012-10-28 18:57:30 +01:00
Regis Houssin
b952a7f9bf
Fix: convert line delimiters (use the last eclipse version)
2012-10-28 13:57:21 +01:00
Laurent Destailleur
ee29c65708
Move stock import into stock module (stock module is at a low level than
...
product)
2012-10-27 20:27:07 +02:00
Christophe Battarel
253e3412db
fix wrong insert sql construction
...
field type detection was made before optional conversions so it might be wrong; i replaced it with a more simple solution
2012-10-27 12:55:28 +02:00
simnandez
9ada60afbc
New: More import options. Products categories
2012-10-26 18:53:56 +02:00
simnandez
3821bf8c66
New: More import options. Products categories
2012-10-26 18:43:34 +02:00
simnandez
9a05bc8e83
New: More import options. Products categories
2012-10-26 18:38:34 +02:00
simnandez
d4df585e3c
New: More import options. Customer and suppliers categories
2012-10-26 18:34:49 +02:00
simnandez
425ebae802
New: More import options. Products categories
2012-10-26 18:19:04 +02:00
simnandez
7aec227694
New: More import options. Products stocks
2012-10-26 17:52:53 +02:00
simnandez
970933ec7f
Fix: [ bug #579 ] Multi-Company and imports
2012-10-26 17:29:41 +02:00
Regis Houssin
c521a77e92
New: add key generator in webservices admin page
2012-10-26 15:20:47 +02:00
Regis Houssin
b5d70ad17f
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-25 22:30:41 +02:00
Regis Houssin
48ce43d6f1
New: add export filters (thank you Charles Benke)
2012-10-25 22:30:17 +02:00
simnandez
e89a06bb9c
Fix: Bad ProfId assignation in imports
2012-10-25 17:08:25 +02:00
Laurent Destailleur
daeb1029a1
New: Support field required or not
2012-10-25 13:11:55 +02:00
Regis Houssin
9d95e8bffb
Fix: missing hookmanager
2012-10-25 11:44:04 +02:00
Regis Houssin
f8f1d3a0df
Fix: borken feature, add PROPALE_PDF_PAIEMENT_ENABLED for view paiement
...
mode and paiement method in pdf
2012-10-25 09:24:05 +02:00
Regis Houssin
23707e2346
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-24 22:50:44 +02:00
Regis Houssin
65594d88a0
Fix: strict mode
2012-10-24 22:50:19 +02:00
Laurent Destailleur
d1a4a6a090
New: Support synchro of field job/title.
...
New: Add script to synchronize users from ldap to dolibarr.
2012-10-24 21:19:10 +02:00
Laurent Destailleur
eaad5f075e
Fix: Some fix to removed refused controls by distrib package build
...
systems.
2012-10-22 13:08:55 +02:00
Laurent Destailleur
d56791d4dc
Fix: Works with PHP 5.2
2012-10-22 00:43:59 +02:00
Laurent Destailleur
bba5057d5d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-21 15:51:03 +02:00
Laurent Destailleur
fbb3ce63a7
Fix: PDF works with US executive format.
2012-10-21 15:50:53 +02:00
simnandez
aa53b7a2ba
New: More import options. Thirds Bank Accounts
2012-10-19 13:00:53 +02:00
Laurent Destailleur
0152e226c1
Fix: Use correct translation of fields
2012-10-18 13:25:32 +02:00
Laurent Destailleur
82e0462dc8
Merge pull request #453 from simnandez/develop
...
New: More import options. Categories Trad: Add es_ES and ca_ES missing translations
2012-10-18 03:31:55 -07:00
Regis Houssin
d705995a49
Fix: convert line delimiters
2012-10-18 10:36:53 +02:00
Laurent Destailleur
97001951e6
New: Add field stock into product export
2012-10-17 20:32:57 +02:00
simnandez
d7dcd3c14b
New: More import options. Supplier Products
2012-10-17 19:02:12 +02:00
Laurent Destailleur
4d5a6c6f01
Typo error
2012-10-17 15:07:13 +02:00
