Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
108,518 Commits 36 Branches 189 Tags
0fd2e91ccc127f2a0791e2e9eb57504acba0d025
Commit Graph

6313 Commits

Author SHA1 Message Date
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
Raphaël Doursenaud
a6b0f6cfac Allow exporting projects without a third party 
FIX #2729
 2015-05-01 15:56:39 +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
f1032baaab Allow exporting projects without a third party 
FIX #2729
 2015-04-30 11:48:32 +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
Marcos García de La Fuente
15b1f03a08 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/list.php
	htdocs/comm/prospect/list.php
	htdocs/societe/consumption.php
	htdocs/societe/soc.php
 2015-04-19 00:48:07 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
 2015-04-19 00:23:46 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
Laurent Destailleur
9dd73de9b0 Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:47:20 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Florian HENRY
62ef9743ea Merge branch 'develop' into dev_pdfpropalmergeproductpdf 2015-04-18 19:16:33 +02:00
Laurent Destailleur
e1403b136c Merge pull request #2639 from aternatik/stable_resource 
New : mark resource module as stable
 2015-04-18 18:48:24 +02:00
Florian HENRY
e15d4c045d NEW : Propal merge product card PDF into azur 2015-04-18 18:44:05 +02:00
jfefe
5c4633d538 New : mark resource module as stable 2015-04-18 18:18:21 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Raphaël Doursenaud
54b8aa8a0b Fixed typo in task export 
Closes #2607, #2609
 2015-04-14 19:14:16 +02:00
BENKE Charlie
aa076b2af6 Update modBanque.class.php 
added the id of bordereau for link with the cheque
 2015-04-14 10:19:41 +02:00
BENKE Charlie
db02cab550 Update modBanque.class.php 
added fk_bordereau on bank export 1 to link the 2 export
 2015-04-14 01:23:42 +02:00
Laurent Destailleur
d7ef1e7da0 The supplier code was not visible on supplier pdf. 2015-04-13 14:25:27 +02:00
Laurent Destailleur
e036e7baf4 Restore correct filling of page 2015-04-12 19:37:49 +02:00
BENKE Charlie
59bff8afac Update pdf_paiement.class.php 
Minors bug fix (first page with bad numbering)
improvement compute of number of page
better fillment of page with line (save the tree is good for karma)
 2015-04-11 12:22:42 +02:00
Laurent Destailleur
530650b857 Make module productbatch stable 2015-04-10 11:59:41 +02:00
Laurent Destailleur
fc803e7000 Fix permission lost when enabled/disabled module. 2015-04-08 17:33:38 +02:00
Scrutinizer Auto-Fixer
918ed34364 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-07 00:45:30 +00:00
Scrutinizer Auto-Fixer
4da737424e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-06 10:25:30 +00:00
Laurent Destailleur
828dc2c9f4 Fix code standard 2015-04-06 12:22:52 +02:00
Laurent Destailleur
2ec5595277 NEW Can install an external module from admin pages, if web server has 
permission for and if setup is ok for.
 2015-04-04 00:19:03 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
Laurent Destailleur
4241244345 Fix: class not defined 2015-04-02 17:35:07 +02:00
Laurent Destailleur
c90a86e4a4 Fix filters for exports 2015-04-02 16:58:36 +02:00
Laurent Destailleur
761409caf6 Fix sql error 2015-04-02 15:17:07 +02:00
Marcos García de La Fuente
8b8171c700 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/card.php
 2015-03-30 03:25:57 +02:00