2
0
forked from Wavyzz/dolibarr
Commit Graph

6584 Commits

Author SHA1 Message Date
Laurent Destailleur
8222624ff0 NEW Can select fields to show on list also for list of customer orders,
shipments and invoices.
2016-04-08 02:39:57 +02:00
Laurent Destailleur
24c91933d0 Work on select fields for orders, invoices and shipments 2016-04-08 01:00:02 +02:00
Laurent Destailleur
ee53a8b1a8 NEW Can filter modules on publisher 2016-04-06 16:45:22 +02:00
Laurent Destailleur
a43a0a3f4c Debug module loan and disable non working features 2016-04-06 11:21:55 +02:00
Alexis Algoud
61a077b0ee NEW reputation for price supplier 2016-04-06 09:58:03 +02:00
frederic34
e53501f89d add lang 2016-04-04 18:37:04 +02:00
Laurent Destailleur
5101c96223 Restore button to create object from the project view. 2016-04-04 15:25:08 +02:00
Florian HENRY
344a87f970 Merge branch 'develop' into develop_advtargetemailiing
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-04-04 14:43:17 +02:00
Juanjo Menent
d55d12baeb NEW #3510 : Working 2016-04-03 11:56:31 +02:00
Florian HENRY
ae51321040 Debug Advance target emailing 2016-04-01 14:30:02 +02:00
Florian HENRY
867dbc766e Merge branch 'develop' into develop_advtargetemailiing 2016-04-01 14:03:43 +02:00
Laurent Destailleur
be483bd787 FIX Some records were lost into margin per product report 2016-04-01 12:28:15 +02:00
Laurent Destailleur
8a1358d539 FIX Some records were lost into margin per product report 2016-04-01 12:27:49 +02:00
Florian HENRY
304aab957b Start implement advance arget emalaing 2016-04-01 10:52:19 +02:00
Laurent Destailleur
54f3005666 NEW Can select fields to show on proposal lists. 2016-03-31 11:58:05 +02:00
Laurent Destailleur
27cf494009 Fix bad translation 2016-03-30 23:35:43 +02:00
Laurent Destailleur
2d9c53fc26 NEW Merge all boxes "related objects" into one. This save a lot of room
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
Laurent Destailleur
0c3635cf8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-30 15:25:27 +02:00
Laurent Destailleur
e908b983d4 NEW Can search on shipments into the quick search box 2016-03-30 15:25:16 +02:00
aspangaro
c9271e04a0 Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-03-29 19:54:41 +02:00
Laurent Destailleur
6b4909f802 Lost sort params 2016-03-29 15:31:52 +02:00
Laurent Destailleur
6188c3fced NEW Introduce a predefined job to run database backup 2016-03-29 14:52:27 +02:00
aspangaro
432cc44ab6 NEW: Accountancy - Add category 2016-03-28 13:51:19 +02:00
Laurent Destailleur
4145874d34 Better tranlsation message 2016-03-26 12:29:13 +01:00
Laurent Destailleur
facdddbb23 Merge pull request #4888 from defrance/patch-112
Add : new translations
2016-03-25 18:13:45 +01:00
Laurent Destailleur
46fe16be0b Merge pull request #4871 from sbechet/develop
Postgresql compatibility patch + cosmetic
2016-03-25 17:57:29 +01:00
aspangaro
05df3408f2 Debug works 2016-03-25 15:59:38 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
BENKE Charlie
efa7761b34 Add : new translations 2016-03-24 13:48:45 +01:00
aspangaro
1712ad04cc Debug works 2016-03-23 22:23:59 +01:00
Sebastien Bechet
82f74ceb38 Postgresql compatibility patch + cosmetic 2016-03-22 10:09:41 +01:00
Michael Fenton
51125483aa Update main.lang
Changing 'Quadri' to Quarter..
2016-03-19 20:03:26 +11:00
Laurent Destailleur
5eef373ed6 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/user/card.php
2016-03-18 14:56:44 +01:00
Laurent Destailleur
5edeeae384 FIX Bad error and style message when changing its own login 2016-03-18 11:30:15 +01:00
Laurent Destailleur
44dc07a61b Merge pull request #4807 from bafbes/abb-13
added handle to trigger FICHINTER_ADD_CONTACT in notify module
2016-03-18 02:40:27 +01:00
Laurent Destailleur
c20124e369 Merge pull request #4829 from jtisseau/starttls
NEW Sending email can also use the STARTTLS protocol.
2016-03-18 00:48:13 +01:00
Laurent Destailleur
7692c39879 Merge pull request #4614 from bafbes/abb-3
include expense reports in linked objects section and provide template for them in this section
2016-03-18 00:26:24 +01:00
Laurent Destailleur
dfcd72399a Missing translation 2016-03-17 11:37:07 +01:00
Laurent Destailleur
eb3ffb30c5 Add mongolian language 2016-03-16 11:29:56 +01:00
Laurent Destailleur
6269503888 Add es_EC and es_PA language 2016-03-16 11:23:00 +01:00
jtisseau
969893a5b1 Adds multilanguage translations for MAIN_MAIL_EMAIL_STARTTLS
Adds the translations for all languages having the MAIN_MAIL_EMAIL_TLS
const defined. It's just a copy of this last one changing the "(SSL)" by
"(STARTTLS)".
2016-03-16 02:23:06 +01:00
abb
d35f728fad added handle to trigger FICHINTER_ADD_CONTACT in notify module 2016-03-13 19:58:39 +01:00
Laurent Destailleur
8b16a76936 Avoid duplicate translation 2016-03-11 10:59:28 +01:00
Laurent Destailleur
2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/compta.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/commerciaux.php
	htdocs/societe/consumption.php
2016-03-10 15:09:30 +01:00
Laurent Destailleur
45ab31815b Merge pull request #4767 from grandoc/3.9
fix : missing translation
2016-03-10 13:34:09 +01:00
Laurent Destailleur
a61882d847 Sync transifex 2016-03-10 12:44:05 +01:00
Laurent Destailleur
5bd5323c93 Finished to move the mergepdftool dedicated page into the generic "mass
actions" feature.
2016-03-10 12:11:11 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
philippe grand
44d71c2bb4 fix : missing translation 2016-03-08 09:08:31 +01:00
Laurent Destailleur
446a080c75 NEW Mutualize code to manage email substitution variables. Show
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00