Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,786 Commits 36 Branches 189 Tags
061e675b51abc72e9ecfcaaca69d46d5e64df3b4
Commit Graph

147 Commits

Author SHA1 Message Date
Laurent Destailleur
c89c89c73e Mutualise code and some fixes for stock management. 2015-05-04 22:02:54 +02:00
Laurent Destailleur
08dfcf3afc Merge 2015-04-18 18:14:55 +02:00
Laurent Destailleur
ca05c9a26f Fix PHPCS 2015-04-18 18:07:36 +02:00
Florian HENRY
b7191a541c All send email card works with model choice box 2015-04-18 17:15:36 +02:00
Florian HENRY
cc887ceff3 fix typo 2015-04-18 16:45:45 +02:00
Florian HENRY
d3592c8d58 typo 2015-04-18 13:09:35 +02:00
Florian HENRY
3d8a7ee179 Start email template selector 2015-04-18 11:06:53 +02:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
Laurent Destailleur
1ca4e377d5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-02-20 23:47:09 +01:00
Marcos García de La Fuente
d46c76311c Correction 2015-02-20 10:23:17 +01:00
Marcos García de La Fuente
2c074a94f3 Fix: [ bug #1790 ] Sending a test mail from admin page, gives "File already exists" error 2015-02-15 15:57:38 +01:00
phf
a9d26efee8 [CORE] ajout des conditions pour un element de type askpricesupplier (#new_ask_price). 2015-01-28 14:44:48 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
0fba70d4d1 Fix: Triggers sending email for intervention and classify billed 2014-10-20 11:35:34 +02:00
Laurent Destailleur
2cf21f856c Fix: table name differs. 2014-10-14 01:47:31 +02:00
Laurent Destailleur
e101bfceea Use language to find template email. 2014-10-12 21:24:51 +02:00
Raphaël Doursenaud
c15849df2d Fixed typo 2014-09-17 16:40:35 +02:00
Laurent Destailleur
a834796181 New: Content of predefined email come firstly from table 
llx_c_email_template, then translation key.
 2014-09-17 01:12:59 +02:00
Laurent Destailleur
2624632fde Fix: bad test commande_send -> order_send 2014-08-05 19:55:14 +02:00
Laurent Destailleur
e95a9cad03 New: When force of bcc is set, we show it onto email form. 2014-08-05 19:32:24 +02:00
Laurent Destailleur
b8a0f6aec9 New: Add option to foce delivery receipt to yes 2014-08-04 19:03:15 +02:00
Laurent Léonard
0228cd9db7 Fix translations in e-mail forms 2014-07-28 02:45:58 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 
Conflicts:
	htdocs/product/class/product.class.php
 2014-06-26 21:38:03 +02:00
Laurent Destailleur
5c0813e865 Fix: EMail test feature to make a test without html must not include any 
html.
 2014-06-21 01:26:41 +02:00
Florian HENRY
9bb537f399 - New: If multilangue is enabled, mail (from propal, invoice, etc...) 
message is pre-defaulted in Customer language
 2014-06-18 09:59:15 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
b56f59b313 Perf: Avoid to isntantiate object 'form' into 'subform' classes when 
already available.
Qual: Better information into xdebug page.
 2014-05-01 16:26:57 +02:00
Laurent Destailleur
b11bd00e9a Fix: Removed blank lines at beginning of email when contact not defined 2014-04-30 15:17:39 +02:00
Raphaël Doursenaud
7039fd3892 Qual: Missing class property declaration 2014-04-23 18:23:57 +02:00
Laurent Destailleur
22854e5743 New: Sending remind of unpayed invoices by emails (need tester) 2014-02-24 16:50:36 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
Laurent Destailleur
4915ec8916 Fix: Bad space in predefined messages. 
Fix: Signature was not added for email sent from thirdparty page.
 2014-02-19 15:33:04 +01:00
Laurent Destailleur
9e06f185c5 Fix: Fix problem of invalid paypal link with \n. 2014-02-06 18:19:49 +01:00
Laurent Destailleur
6b2966794a Do not show free text for thirdparty email send form 2013-09-23 14:35:22 +02:00
Laurent Destailleur
cb04b05e85 New: Can send an email from thirdparty card. 2013-09-23 13:17:31 +02:00
Maxime Kohlhaas
e3d4a7bc35 Fix : wrong contact list was used for cc and ccc in formmail 2013-09-18 13:36:22 +02:00
Maxime Kohlhaas
a0738e86d8 Better fix for email text / signature integration 2013-08-02 10:24:09 +02:00
Maxime Kohlhaas
c40e187842 Typo 2013-07-30 17:30:09 +02:00
Maxime Kohlhaas
dfae157cc5 Fix : email message combined with html signature made troubles with line breaks 2013-07-30 17:29:24 +02:00
Laurent Destailleur
e871ea64eb Fix: Regression 2013-06-03 19:52:34 +02:00
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00
fhenry
cf21b32eb1 task #768 2013-03-16 09:46:34 +01:00
fhenry
e71103ed02 task #768: 
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144 
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
 2013-03-16 09:23:34 +01:00
Laurent Destailleur
3eb485d521 Qual: Removed TODO, deprecated code and deprecated properties. This also 
fix missing combo box of contacts onto CC.
 2013-02-12 17:08:21 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Regis Houssin
c732532483 New: add hook getFormMail 2013-01-24 17:29:11 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00