Commit Graph

6405 Commits

Author SHA1 Message Date
cla
1ebe6fb9b5 UPDATE:
sendings EN_US lang file
2015-12-16 16:21:05 +01:00
Laurent Destailleur
90dbfc4870 Fix: to avoid confusion between amount of payment and amount distributed
on invoice when a payment is done for several invoices, export of
payment can export both fields.
2015-12-15 15:52:20 +01:00
BENKE Charlie
23e727048e Add some new translations for export feature 2015-12-15 10:35:11 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
3680202c1c Fix do not share color for title of table and title of pages 2015-12-13 14:39:12 +01:00
aspangaro
c3acee56e2 Fix #3879 Wrong translation in the new expense report module 2015-12-12 10:06:11 +01:00
Frédéric FRANCE
5f0c7b6c38 Update paypal.lang 2015-12-10 16:31:11 +01:00
Laurent Destailleur
2aca50f7f8 Removed useless string 2015-12-06 13:56:15 +01:00
Laurent Destailleur
9c227d154e Clean duplicate translation key 2015-12-06 13:37:48 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to
remove around 50 duplicates.
2015-12-06 13:34:57 +01:00
Laurent Destailleur
0279e99b0a Update warning for mysql 5.5.4* bug 2015-12-06 12:04:34 +01:00
Laurent Destailleur
e002021d7d Fix td balance 2015-12-05 17:49:08 +01:00
Laurent Destailleur
e6ebc9c293 More complete tooltip help 2015-12-04 12:24:36 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
Laurent Destailleur
7105fabb79 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/langs/en_US/users.lang
	htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:51:49 +01:00
Laurent Destailleur
540609d5ed Merge pull request #4139 from bafbes/patch-9
Update products.lang - include translation for units key in product/card.php
2015-12-03 12:01:10 +01:00
Laurent Destailleur
055e650adf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-02 23:23:38 +01:00
Laurent Destailleur
574b270da0 Work on the "mass action" feature. Can run mass action on
result of a select.
2015-12-02 22:00:39 +01:00
Bahfir Abbes
7841c97387 Update products.lang 2015-12-02 19:34:02 +01:00
Bahfir Abbes
134adcf637 Update products.lang 2015-12-02 18:55:51 +01:00
Laurent Destailleur
6df4948a73 Fix text 2015-12-01 03:12:12 +01:00
Laurent Destailleur
357bc7a00c Fix color link 2015-11-30 21:40:14 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Laurent Destailleur
480623a6d5 Uniformize GUI. All lists must have a search on status at end and last
column is dedicaded to future "mass action checkbox".
2015-11-29 13:03:46 +01:00
Laurent Destailleur
5df193ec93 Uniformize code 2015-11-28 20:25:50 +01:00
aspangaro
d12e3ca91f Finish work on better integration of skype 2015-11-28 14:43:16 +01:00
aspangaro
9817ce8b20 Merge remote-tracking branch 'Upstream/develop' into develop-skype 2015-11-26 07:12:04 +01:00
aspangaro
9a2259c681 Correct button 'Export' and 'Write bookkeeping' on finance journal 2015-11-26 06:19:24 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Laurent Destailleur
bc6d04e495 Typo 2015-11-26 00:08:34 +01:00
Laurent Destailleur
f79aeeeb0b Merge pull request #4068 from aspangaro/develop-accountancy
Fix: typo on finance journal
2015-11-25 23:33:29 +01:00
aspangaro
3457a732f5 New: Better integration of skype 2015-11-25 20:19:18 +01:00
Raphaël Doursenaud
91ce70a6e9 FIX #4081 Added missing translation 2015-11-23 17:25:10 +01:00
aspangaro
0899e7392b Fix: typo on finance journal 2015-11-22 22:11:22 +01:00
Laurent Destailleur
ffeae34f51 Update doc 2015-11-22 18:41:35 +01:00
Laurent Destailleur
73bcc3bfe3 The temp dir for cache used by rester is correctly managed: No temp or
data files must be stored outside of documents directory.
2015-11-22 17:39:13 +01:00
Laurent Destailleur
3aa25cd2be Merge pull request #4064 from frederic34/escpos
Add profile escpos printer
2015-11-22 17:09:15 +01:00
Laurent Destailleur
91f1acd1f1 Merge pull request #4063 from grandoc/develop
fix : Typo and translation
2015-11-22 17:07:22 +01:00
frederic34
6b4b70bdbb translations and help 2015-11-22 14:11:33 +01:00
Laurent Destailleur
cb3765bc92 Debug module Resource 2015-11-22 12:23:10 +01:00
philippe grand
f4c8b5e7f8 missing translation 2015-11-22 10:46:17 +01:00
philippe grand
210c6c67cd better translation and missing translation 2015-11-22 10:40:04 +01:00
philippe grand
9cdf0f427e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-22 10:15:57 +01:00
Laurent Destailleur
e3c6e4ebe5 NEW Add planned workload and declared progress on project summary list
on project home page (data aggregated from tasks of project)
2015-11-21 20:00:38 +01:00
philippe grand
0408e309f8 fix : Typo and translation 2015-11-21 19:13:34 +01:00
Laurent Destailleur
9db71098ac Merge pull request #4031 from FHenry/develop
PG SQL
2015-11-21 01:50:47 +01:00
Laurent Destailleur
a906774595 Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order
NEW 3.9 add billed status for supplier order
2015-11-21 00:20:17 +01:00
Florian HENRY
b8cab9f4d9 continue extrafeild $ID$ and SELECT feature 2015-11-20 13:51:57 +01:00
Florian HENRY
1566be35a1 NEW : add $ID$ into extrafields management to allow use current object
id on filter for select list from table and checkbox list from table
2015-11-20 11:59:28 +01:00