Commit Graph

56461 Commits

Author SHA1 Message Date
PeartreeG
f6dc4757d0 add fields for resource tracking 2016-01-31 18:13:14 +01:00
Laurent Destailleur
d9e089256e Fix path to copyrighted files 2016-01-31 16:16:46 +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
2cde6f39ff Missing error message 2016-01-31 15:16:45 +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
Laurent Destailleur
26cd0ac0c6 Fix duplicate field 2016-01-31 13:19:08 +01:00
PeartreeG
1fbfdbfefd add new ressources fields 2016-01-31 12:47:18 +01:00
PeartreeG
b47065862a Update llx_resource.sql 2016-01-31 12:38:05 +01:00
PeartreeG
91e46b1d35 add somes fields on resource 2016-01-31 12:37:03 +01:00
PeartreeG
f4a6945aa0 add note feature on resource module 2016-01-31 12:30:15 +01:00
PeartreeG
265f01806c add document feature on resource modules 2016-01-31 12:27:46 +01:00
PeartreeG
c34fd7b354 add contact tabs on resource 2016-01-31 12:26:12 +01:00
PeartreeG
d1018760df Update resource.lib.php 2016-01-31 12:24:19 +01:00
PeartreeG
4c025d4323 Adding additional tabs 2016-01-31 12:23:05 +01:00
PeartreeG
581ea0f36b adding resource in contact type list 2016-01-31 12:17:45 +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
Florian HENRY
7d374c2b02 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/core/class/link.class.php
2016-01-30 17:32:01 +01:00
BENKE Charlie
d75a20c589 bad id on restricted aera 2016-01-30 17:30:06 +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
Bahfir Abbes
2a1ab9a8d4 Update card.php
delete empty row in select list of vats in expenses as this value is not accepted
2016-01-30 16:43:35 +01:00
Laurent Destailleur
67dbb1571c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-30 16:29:20 +01:00
Laurent Destailleur
9a87d2bee5 Fix phpcs 2016-01-30 16:28:48 +01:00
Laurent Destailleur
a31e035bc6 Add more explanation on late definition 2016-01-30 16:19:49 +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
Laurent Destailleur
dfd4d36bdf Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-30 15:58:11 +01:00
Laurent Destailleur
c9661ee20e Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-30 15:57:09 +01:00
Laurent Destailleur
129f5aad8e Fix bad translation 2016-01-30 15:56:04 +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
6e69e99227 FIX VAT Rate was not visible in log of old price list 2016-01-30 15:34:06 +01:00
Laurent Destailleur
83b297a9b2 FIX VAT Rate was not visible in log of old price list 2016-01-30 15:33:11 +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
cc7d105d88 Fix height in mapping impot step 2016-01-30 15:07:22 +01:00
Laurent Destailleur
eee0037a5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-30 14:32:47 +01:00
Laurent Destailleur
c4d8c20abb Fix missing include 2016-01-30 14:32:20 +01:00
Florian HENRY
36901d5417 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-30 14:21:45 +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
Laurent Destailleur
017af42243 Merge pull request #4531 from manact/patch-1
Do not select siren but tva_intra from societe
2016-01-30 12:54:33 +01:00
Laurent Destailleur
b0234a7d20 Merge pull request #4513 from frederic34/patch-10
Avoid errors with bad parameters
2016-01-30 12:53:21 +01:00
Laurent Destailleur
3c63bf7ffa Merge pull request #4465 from defrance/patch-95
if FAC_FORCE_DATE_VALIDATION can't change the billing date
2016-01-30 12:43:52 +01:00
Laurent Destailleur
bb1cad871b Merge pull request #4478 from frederic34/patch-7
Add fk_bordereau in account statements
2016-01-30 12:34:09 +01:00
Laurent Destailleur
11f6cb6f5a Merge pull request #4479 from frederic34/patch-8
Add fk_bordereau in account statement conciliation
2016-01-30 12:31:36 +01:00
Laurent Destailleur
09a24b8dd8 Merge pull request #4496 from frederic34/patch-9
Text not initialized
2016-01-30 12:24:40 +01:00