Commit Graph

4360 Commits

Author SHA1 Message Date
Laurent Destailleur
fb53b41078 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 19:20:04 +02:00
Laurent Destailleur
bcc0f0c488 Merge pull request #5067 from grandoc/develop
Fix : missing translation
2016-04-22 19:12:36 +02:00
Laurent Destailleur
bfc5be1aad FIX Fix and move dolGetFirstLine function into main
FIX Hang on ->client not defined
2016-04-22 19:07:32 +02:00
Laurent Destailleur
2cc24db6a2 Fix typo 2016-04-22 13:45:54 +02:00
Laurent Destailleur
7515b2ba7b NEW Add a parameter on graph function to show a generic graph when no
data are available.
2016-04-22 12:11:57 +02:00
Laurent Destailleur
78d18185e4 Several css enhancements 2016-04-22 11:11:08 +02:00
philippe grand
0c7d7245a8 missing translation 2016-04-22 09:37:35 +02:00
Laurent Destailleur
4619040983 Work on website module 2016-04-19 18:41:05 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page
& review
2016-04-17 15:44:04 +02:00
Laurent Destailleur
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
Laurent Destailleur
27217ccccd Maxi debug of supplier order workflow.
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
2016-04-09 18:51:09 +02:00
Laurent Destailleur
448758bbf4 Merge branch 'develop_NEW_supplier_price_reputation' of
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_supplier_price_reputation

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-04-08 22:01:55 +02:00
Laurent Destailleur
010a4f8929 Merge pull request #4945 from frederic34/shipcust
NEW : Select Preferred Sending Method for a third party
2016-04-08 21:31:06 +02:00
Laurent Destailleur
f14b03a230 NEW Add more trackable events (create, submit and receive supplier
order). So we will be able to use generic features to log what was done
with the specific table llx_commande_fournisseur_log
2016-04-08 17:07:25 +02:00
Laurent Destailleur
a74fc347bb Fix translation 2016-04-08 15:41:01 +02:00
Laurent Destailleur
1b04eabf1f Merge log with events tabs 2016-04-08 14:28:49 +02:00
Laurent Destailleur
cefc373a5f Missing translations 2016-04-08 11:42:02 +02:00
Laurent Destailleur
7a48ceb635 Uniformize code for mass actions 2016-04-08 02:53:10 +02:00
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
Juanjo Menent
d55d12baeb NEW #3510 : Working 2016-04-03 11:56:31 +02:00
Laurent Destailleur
8a1358d539 FIX Some records were lost into margin per product report 2016-04-01 12:27:49 +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
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
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
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