aspangaro
766c58724a
ER: Review & add a totalVAT in pdf
2015-05-14 08:26:41 +02:00
aspangaro
bba0349ab6
ER: traduce code
2015-05-14 07:36:48 +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
Juanjo Menent
23bd8f50df
Merge pull request #2809 from atm-maxime/develop
...
New : Signature area on proposal PDF
2015-05-11 20:09:54 +02:00
Laurent Destailleur
a503d90982
FIX We did a test on a permission to export contract when permission did
...
not exists.
2015-05-10 23:37:04 +02:00
Maxime Kohlhaas
443badfbcf
New : Signature area on proposal PDF
2015-05-10 17:39:57 +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
Laurent Destailleur
afc487ef9d
Fix phpcs
2015-05-07 13:28:03 +02:00
Laurent Destailleur
36ebaf7a22
Clean code
2015-05-06 23:31:03 +02:00
Maxime Kohlhaas
1cb7d284a5
Fix : shipment PDF was not using generation params
...
Conflicts:
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/fiche.php
2015-05-06 21:29:58 +02:00
Maxime Kohlhaas
72c4337f4b
Fix : shipment PDF was not using generation params
...
Conflicts:
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/fiche.php
2015-05-06 21:18:31 +02:00
Juanjo Menent
ea95a461e2
Fix: Make propal pdf "azur" compatible with the two products images
...
storage system on use MAIN_GENERATE_PROPOSALS_WITH_PICTURE
2015-05-06 17:17:41 +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
Laurent Destailleur
f97d81701b
Add an exit to avoid to have apache hangs.
2015-05-05 13:46:28 +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
467ee7b771
Fix error into export filter step
...
Conflicts:
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modContrat.class.php
htdocs/core/modules/modFournisseur.class.php
2015-05-05 12:45:38 +02:00
Laurent Destailleur
c665bfa3ee
Fix error into export filter step
2015-05-05 12:39:27 +02:00
Laurent Destailleur
a18e3c7813
Fix correct id of core modules
2015-05-04 12:02:09 +02:00
jfefe
53f480708f
Merge branch 'develop' into api_restler
2015-05-03 23:43:13 +02:00
Laurent Destailleur
8a7728f193
Merge pull request #2752 from fappels/develop-tcpdfbarcode
...
NEW add tcpdf barcode generator and printing, add 2d Datamatrix and QRcode CLOSE #2655
2015-05-03 21:19:01 +02:00
jfefe
2ea8c90fe2
Module descriptor for API module
2015-05-03 14:53:40 +02:00
Laurent Destailleur
0479bd5a59
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/modAdherent.class.php
2015-05-03 13:00:39 +02:00
Francis Appels
2b32dc4ba8
Apply correct tabulation
2015-05-03 11:51:54 +02:00
Francis Appels
cb75d0778a
Fix doc errors
2015-05-03 11:09:33 +02:00
Francis Appels
fee4c4e0e2
Fix: add newline at eof
2015-05-03 10:26:12 +02:00
Francis Appels
f9ece24f95
Fix: Member card header/footer text
2015-05-03 10:09:31 +02:00
Francis Appels
f9908c48cb
Add datamatrix en qrcode barcodes
2015-05-03 10:07:04 +02:00
Francis Appels
96dfdfeb73
New tcpdf barcode label printing class
...
New tcpdf barcode label printing class and add parameters to printsheet
for using this class.
Add parameter to modules_xxx.php functions to pass printing templete
class to use
2015-05-03 10:05:59 +02:00
Francis Appels
701c85620b
Extend sticker classes from abstract class
...
Extend member and printsheet sticker printer classes from new abstract
commonsticker generator
2015-05-03 10:00:11 +02:00
aspangaro
315e9239ac
Merge remote-tracking branch 'Upstream/develop' into develop-accountancy2
2015-05-02 06:45:53 +02:00
aspangaro
1174c67b07
Accountancy - Add key language & prepare journal for expense report
2015-05-02 06:42:06 +02:00
Raphaël Doursenaud
31a8e38d37
Allow exporting projects without a third party
...
FIX #2729
Conflicts:
htdocs/core/modules/modProjet.class.php
2015-05-01 16:01:57 +02:00
Raphaël Doursenaud
93937fe7f3
Allow exporting projects without a third party
...
FIX #2729
2015-05-01 15:58:36 +02:00
Juanjo Menent
29c9686b8e
Merge pull request #2730 from GPCsolutions/dolibarr-2718
...
Export task labels
2015-04-30 21:02:17 +02:00
Juanjo Menent
91767edd05
Fixed SQL table reference for members types in export
2015-04-30 20:50:05 +02:00
Raphaël Doursenaud
afc582a369
Fixed SQL table reference for members types in export
...
FIX #2712
2015-04-30 17:20:53 +02:00
Francis Appels
f762d6d7cb
Add tcpdfbarcode
...
Add modTcpdfbarcode class
Add pdf_label class
pdf_standardlabel extends pdf_label
2015-04-30 16:41:52 +02:00
Raphaël Doursenaud
2058d21da9
Export task labels
...
FIX #2718
2015-04-30 11:43:42 +02:00
Laurent Destailleur
060d8a1a38
FIX Ref/label of product on contract line was not visible, nor into
...
page, nor into PDF.
2015-04-29 19:57:01 +02:00
Laurent Destailleur
305030ae6c
Fix test to match new field names of note
2015-04-22 21:58:12 +02:00
Laurent Destailleur
807824aaad
Fix warnings
2015-04-22 21:48:59 +02:00
Laurent Destailleur
7f5377d219
Fix #2695
2015-04-22 19:25:20 +02:00
Laurent Destailleur
b57d3ddf03
Merge pull request #2695 from Ankapi/develop
...
Fixed hook "pdfgeneration" in the pdf blochet of cheque deposit
2015-04-22 19:24:40 +02:00
Laurent Destailleur
100fa1067e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
David Avigni (Ankapi)
e298bd0a68
Fixed hook "pdf generation", executeHooks misnamed: replacement
...
"adterPDFCreation" with "afterPDFCreation"
2015-04-22 15:23:52 +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
Laurent Destailleur
111b54d82c
Fix phpcs
2015-04-19 03:02:49 +02:00
