Commit Graph

9302 Commits

Author SHA1 Message Date
phf
7e3a787688 FIX phpcs 2016-02-04 19:03:25 +01:00
BENKE Charlie
5498b1cd5a Update modSociete.class.php 2016-02-04 18:06:43 +01:00
BENKE Charlie
70e051a1bf Add goods customers boxes 2016-02-04 18:05:35 +01:00
Frédéric FRANCE
a656607122 Update CMailFile.class.php 2016-02-04 17:12:58 +01:00
BENKE Charlie
87c5854382 just change for rerun travis cheking 2016-02-04 16:58:19 +01:00
BENKE Charlie
f87bfffdd9 add edition feacture on product element 2016-02-04 16:12:00 +01:00
phf
0c05342934 FIX infinite loop 2016-02-03 22:54:48 +01:00
phf
75c4888364 NEW feature hidden extrafields 2016-02-03 22:49:43 +01:00
phf
1b552a0b3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
Conflicts:
	htdocs/core/class/link.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82 Fix warning when javascript disabled 2016-02-03 03:10:58 +01:00
Laurent Destailleur
229199aaad FIX #4497 2016-02-03 01:32:50 +01:00
Laurent Destailleur
e22664b8cf FIX #4528 2016-02-03 01:01:14 +01:00
Laurent Destailleur
547ffd7fcc Add missing phpunit tests 2016-02-02 17:26:14 +01:00
Laurent Destailleur
d88cd500ce Merge pull request #4547 from bafbes/dev1
fix:remove project info in standard document model for expense reports when project module is disabled
2016-02-02 16:41:12 +01:00
Laurent Destailleur
82cc0b409c Merge pull request #4546 from bafbes/bra
provide link section in expense reports and add option for intervention
2016-02-02 16:17:25 +01:00
Laurent Destailleur
0def82f596 Merge pull request #4543 from aspangaro/develop-export
New: Add User accountancy code in user export
2016-02-02 15:32:56 +01:00
Laurent Destailleur
43ac8b72a3 Merge pull request #4542 from aspangaro/3.9-p9
New accountancy menu for auguria
2016-02-02 15:32:32 +01:00
Florian HENRY
3c94f5d4d4 Add log into next values 2016-02-02 11:38:32 +01:00
Laurent Destailleur
64514b38da Merge remote-tracking branch 'origin/3.9' into develop 2016-02-01 01:23:41 +01:00
Laurent Destailleur
f22373b70b Fix bad management of option MAIN_HTML_TITLE 2016-02-01 01:19:37 +01:00
abb
3bcfe849a1 fix:remove project info in standard document model for expense reports when project module is disabled 2016-01-31 22:35:09 +01:00
abb
773ee5c0ea provide link section in expenses and add option for intervention 2016-01-31 19:59:47 +01:00
Laurent Destailleur
475cc24e13 NEW Can edit next execution date of a cron job. 2016-01-31 15:37:23 +01:00
Laurent Destailleur
928336c835 NEW Clean and enhance code for cron engine 2016-01-31 15:14:50 +01:00
Laurent Destailleur
426e9297ea Prepare code to match cron rule: 0 if ok, !=0 if error 2016-01-31 14:20:02 +01:00
abb
2f40233e01 fix : handle case of non existing third party field in object in fecth_thirdparty function 2016-01-31 10:35:56 +01:00
aspangaro
6a12cdc876 New: Add User accountancy code in export 2016-01-31 08:18:47 +01:00
aspangaro
2fa01a1754 Merge remote-tracking branch 'Upstream/3.9' into 3.9-p9 2016-01-31 07:33:57 +01:00
aspangaro
c77fda5128 New accountancy menu for auguria 2016-01-31 07:31:48 +01:00
BENKE Charlie
324c1123e0 Update contacts.tpl.php
if permission modules right are not in french
2016-01-30 17:21:42 +01:00
Bahfir Abbes
32b6f20754 Update smtps.class.php
Set mail reply-to field to sender
2016-01-30 17:13:58 +01:00
Laurent Destailleur
71edb3f061 Fix phpcs 2016-01-30 16:57:00 +01:00
Laurent Destailleur
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
2016-01-30 16:13:06 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +01:00
mic9p
8faeac611a Do not select siren but tva_intra from societe
VAT report by customer shows an empty field.
2016-01-30 15:35:28 +01:00
Laurent Destailleur
5212303208 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-30 15:29:52 +01:00
Laurent Destailleur
d21908755e FIX Import/Export NPR VAT 2016-01-30 15:29:35 +01:00
Laurent Destailleur
c6a6889d79 Merge pull request #4389 from aspangaro/3.9-p6
Fix: Some problems presentation on accountancy module
2016-01-30 13:04:22 +01:00
mic9p
827fd39658 Do not select siren but tva_intra from societe
VAT report by customer shows an empty field.
2016-01-30 10:35:57 +01:00
BENKE Charlie
d79478e66d Add hook on contacttpl
The goal is to display additionnal feature a the bottom of the contact page like display contact adress and print stamp directly
Another way is to show on a google maps the travel to do between us and the multiple thirdpartie present
2016-01-30 09:43:02 +01:00
Laurent Destailleur
19d119d3a4 Debug cron module.
Task to delete temporary files older than 24 is on by default.
2016-01-30 02:51:26 +01:00
Laurent Destailleur
1854f07e5c Move code to purge files into a dedicated utils class (cron job need
class)
2016-01-30 00:12:58 +01:00
Laurent Destailleur
7c2ac4b3ee NEW The probability of lead/opportunity can be defined per lead. 2016-01-28 20:04:02 +01:00
Laurent Destailleur
cd58c93de6 FIX If option to hide automatic ECM is on, dont show menu. 2016-01-28 12:51:34 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
c09fa6e0dd Fix empty keys are not allowed into select 2016-01-28 12:19:06 +01:00
Laurent Destailleur
df4cd3de17 FIX Selection of project must no show closed project 2016-01-28 12:05:14 +01:00
Laurent Destailleur
06bbf4c966 Fix empty keys are not allowed into select 2016-01-27 21:10:42 +01:00
phf
4baff7898d FIX insert FactureLigne
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
2016-01-26 22:18:31 +01:00