lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,304 Commits 43 Branches 150 Tags 886 MiB
3.8
Commit Graph

1824 Commits

Author SHA1 Message Date
Laurent Destailleur
a6bac40f0a Fix bad translation 2015-07-29 13:03:52 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
 2015-07-28 18:57:13 +02:00
fmarcet
6676114501 Fix: Not showing product supplier reference when page break 2015-07-27 16:31:40 +02:00
fmarcet
e130af8033 Fix: Not showing delivery date on rouget pdf (expedition) 2015-07-27 13:11:07 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
aspangaro
b9b6abd7a8 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-18 05:29:57 +02:00
Juanjo Menent
06684ea362 Merge pull request #3250 from aspangaro/3.8-patch7 
Fix: #3228 [Export] Missing member ID field in users
 2015-07-17 19:15:53 +02:00
Juanjo Menent
0971e88531 Merge pull request #3249 from aspangaro/3.8-patch6 
Fix: #3230 [Leaves] Module setup page is useless
 2015-07-17 19:15:31 +02:00
aspangaro
a0d74cc1a1 Fix: #3228 [Export] Missing member ID field in users 2015-07-16 22:50:50 +02:00
aspangaro
440e144892 Fix: #3230 [Leaves] Module setup page is useless 2015-07-16 22:29:04 +02:00
aspangaro
2d3d78ecc0 Fix: #3232 [Agenda] Setup page tab order is weird 2015-07-16 22:16:11 +02:00
Laurent Destailleur
cbce66bba8 Merge pull request #3190 from hregis/3.8_bug2 
Fix: wrong path and add index.html
 2015-07-16 10:07:31 +02:00
aspangaro
4ae15adc69 Fix: wrong link on leave tabs in user card 2015-07-16 06:10:51 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
a9289de616 Several fixes. Fix #2927 2015-07-13 11:22:18 +02:00
Regis Houssin
f23afc3453 Fix: wrong path and add index.html 2015-07-13 10:07:38 +02:00
Laurent Destailleur
8690b5e70e FIX #3173 Overlapping of shipment ref 2015-07-12 16:22:06 +02:00
Laurent Destailleur
688562a816 Fix regression: We can't yet set method __construct of DolibarrModules 
abstract because this break compatibility with a lot of external module
and generate FATAL errors after migration. Because PHP is not yet able
to manage try catch on FATAL error, we can't catch such error. Using
bstract on constructor is so postponed.
 2015-07-10 09:40:18 +02:00
Marcos García de La Fuente
eff573e753 Removed duplicated code from core modules 2015-07-07 13:08:26 +02:00
Marcos García de La Fuente
56ff0c7350 Created abstract functions DolibarrModules::__construct, DolibarrModules::init and DolibarrModules::remove 2015-07-07 13:08:12 +02:00
Laurent Destailleur
56560d9379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:49:01 +02:00
Regis Houssin
4273c4aad9 Fix: data can be just a value, not an array 2015-07-03 11:35:11 +02:00
Regis Houssin
b70dfd0d54 New: possibility to defined a tab for all entities in module descriptor 2015-07-03 11:16:24 +02:00
Regis Houssin
4fb5af7442 Fix: reset the current entity 2015-07-03 10:58:55 +02:00
Laurent Destailleur
312281f4d4 Debug askpricesupplier 
Try to continue work on position of menu entries.
 2015-07-02 22:43:51 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Laurent Destailleur
b6efa5ed11 NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
Laurent Destailleur
c218843cdb FIX Save of filters into export profiles failed. 2015-06-24 18:29:29 +02:00
Florian HENRY
daab394c81 add extrafields into import product 2015-06-24 12:40:56 +02:00
Laurent Destailleur
0780c84012 Fix missing payment mode into export invoice profile 2015-06-23 23:58:04 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
 2015-06-23 18:34:39 +02:00
phf
06962cb4e6 FIX : tool export handle the type "select" extrafields and return the value instead of id 2015-06-23 16:26:05 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
aspangaro
20582b9ea5 Merge remote-tracking branch 'Upstream/develop' into develop-36 2015-06-21 07:31:43 +02:00
Laurent Destailleur
2c5ef858d0 NEW Filter "active" by default on user list. 
Fix label of permission of project module
 2015-06-20 20:35:57 +02:00
aspangaro
0ff97da1ea Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT 2015-06-20 09:06:20 +02:00
Marcos García de La Fuente
a496606826 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/soc.php
 2015-06-13 02:45:42 +02:00
Laurent Léonard
a337b6f874 Rename "duree" property of interventions to "duration" 
This also fixes the display problem of total duration on the "soleil" document model
 2015-06-11 23:18:29 +02:00
Regis Houssin
edd5c33c5b Fix: Strict standards: Only variables should be passed by reference 
http://geoffray.be/blog/php/only-variables-should-be-passed-by-reference
 2015-06-10 18:22:47 +02:00
aspangaro
592d124f26 Merge remote-tracking branch 'Upstream/develop' into develop-28 2015-06-08 21:33:45 +02:00
aspangaro
1d1f19b976 NEW: Add a tab document in donation card 2015-06-08 21:28:32 +02:00
Raphaël Doursenaud
143a7d7328 Use rfc6761 example.com domain instead of domain.com in examples 
Fix #2988
 2015-06-08 17:13:23 +02:00
Laurent Destailleur
8d84dd1155 Uniformize code 2015-06-06 14:34:57 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-06-05 18:31:53 +02:00
Laurent Destailleur
7e3a457f85 Merge pull request #2942 from aspangaro/develop-donation 
Fix: Donation error on admin tab & Fix: Input disabled by default
 2015-06-05 15:57:35 +02:00
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated 
Deprecated
 2015-06-05 15:44:08 +02:00
Laurent Destailleur
a1391ba8b7 Merge pull request #2959 from aspangaro/develop-patch22 
Fix: wrong file & problem to install model
 2015-06-05 09:07:29 +02:00
Laurent Destailleur
5edef2f02f NEW A module can add its entries into cron module. 2015-06-05 03:32:09 +02:00
aspangaro
fc5ea9f20f Fix: wrong file & problem to install model 2015-06-04 21:14:30 +02:00
Laurent Destailleur
4adeb8980d NEW Add ref and label of project into export 2015-06-03 16:40:02 +02:00
aspangaro
bde91633da Fix: input of french article is disabled by default 2015-06-03 06:01:05 +02:00
Laurent Destailleur
6e72d3c8cc FIX Export of tags for contact and member 2015-06-01 21:34:21 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
Laurent Destailleur
1b681510a5 NEW Use new select2 component for juridical status, country and state 
selection.
 2015-05-31 12:25:33 +02:00
Laurent Destailleur
49f2157f2d Little debug of module resource 2015-05-31 02:05:39 +02:00
Laurent Destailleur
0b372a4017 Use a dedicated icon instead of generic one 2015-05-30 17:32:50 +02:00
Laurent Destailleur
7f352e5b24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-30 15:21:56 +02:00
Laurent Destailleur
b14b1c1b12 Use dedicated picto 2015-05-30 15:21:48 +02:00
Laurent Destailleur
03c06b3cf8 Merge pull request #2916 from aspangaro/develop-patch23 
FIX: export salaries & NEW: Add tab document on salaries payment
 2015-05-30 15:09:23 +02:00
Regis Houssin
c8c0f0f038 Fix: possibility to shared facnumber between entities 2015-05-29 11:31:51 +02:00
aspangaro
d3513bf2a7 Fix: lot of typo to export salaries 2015-05-28 06:41:01 +02:00
aspangaro
58893a4576 Fix: problem of rights to export salaries 2015-05-28 06:26:28 +02:00
Marcos García de La Fuente
460a2ec2ab Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/categories/categorie.php
	htdocs/comm/prospect/list.php
 2015-05-25 15:09:46 +02:00
abb
ba68598ec7 added new trigger for supplier invoice unvalidation in Agenda 2015-05-23 15:09:44 +01:00
Laurent Destailleur
4a70bb7acf Work on generic usage of get_exdir. 2015-05-18 23:04:49 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45 Prepare to generalize usage of get_exdir 2015-05-18 21:47:44 +02:00
Florian HENRY
f29d8aed5b Fix problem with multicompany on new feature Product propal merge PDF 
product
 2015-05-15 17:39:28 +02:00
Marcos García de La Fuente
e2b2c1c8bd Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-05-15 12:30:03 +02:00
Marcos García de La Fuente
457918c0f7 Merge remote-tracking branch 'upstream/develop' into commercial-name 2015-05-15 11:17:21 +02:00
Laurent Destailleur
c33cbefad2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 11:16:29 +02:00
Laurent Destailleur
3f5215169a Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr 
into aspangaro-develop-ER_badge

Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
 2015-05-15 02:44:43 +02:00
Laurent Destailleur
bf883e1576 Minor cosmetic changes 
Fix permissions and CRLF
 2015-05-15 02:34:57 +02:00
Laurent Destailleur
74607218ea Fight against key tva_taux. Removed completely. 2015-05-14 15:59:09 +02:00
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
43b5209192 NEW Clean code into salary module, debug and add indexes 
NEW Can filter on user list and salary payments on user with naural
search.
 2015-05-13 08:57:39 +02:00
Laurent Destailleur
8e09f54a46 Minor fixes 2015-05-13 07:46:12 +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
f275145bd2 FIX We did a test on a permission to export contract when permission did 
not exists.
 2015-05-10 23:46:34 +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
Marcos García de La Fuente
ce7ed70d74 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2015-05-10 12:23:07 +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
Maxime Kohlhaas
42455f771a Missing comments 2015-05-06 12:43:41 +02:00
Maxime Kohlhaas
b203263e91 Fix : shipment PDF was not using generation params 2015-05-06 12:16:36 +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
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