lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,803 Commits 43 Branches 150 Tags 886 MiB
4e83abba30
Commit Graph

51803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PeartreeG
4e83abba30 Update element_resource.php 2016-02-01 15:40:16 +01:00
PeartreeG
ceb1cd5798 Update 3.9.0-4.0.0.sql 2016-01-31 18:16:53 +01:00
PeartreeG
e2404b57b3 adding additionnal fields for tracking resource use 2016-01-31 18:15:11 +01:00
PeartreeG
f6dc4757d0 add fields for resource tracking 2016-01-31 18:13:14 +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
Laurent Destailleur
71edb3f061 Fix phpcs 2016-01-30 16:57:00 +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
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
Laurent Destailleur
3591f51918 Merge pull request #4480 from hregis/3.8_bug 
Fix: for avoid conflict with "global $m" in memory.lib.php
 2016-01-30 12:22:47 +01:00
Laurent Destailleur
b27e31b3ae Merge pull request #4483 from marcosgdf/bug-4440-3 
Corrected typo of PR #4444
 2016-01-30 12:20:50 +01:00
Laurent Destailleur
2e7d88dffb Merge pull request #4499 from fmarcet/3.7 
FIX: Contrat card don't consider user permissions to show active/unactive service button
 2016-01-30 12:12:42 +01:00
Laurent Destailleur
4a7b70f144 Merge pull request #4500 from atm-maxime/develop 
Fix : amount in bank line is necessarily in the account currency
 2016-01-30 12:10:30 +01:00
Laurent Destailleur
c77fcfd291 Merge pull request #4503 from fmarcet/3.9 
FIX: Not returning the correct multilevel price
 2016-01-30 12:05:32 +01:00
Laurent Destailleur
f79b1d06cb Merge pull request #4519 from FHenry/3.9 
FIX : set column paid on expense report when expense is paid
 2016-01-30 12:01:10 +01:00
Laurent Destailleur
e2d9989574 Merge pull request #4518 from FHenry/3.9_compta 
3.9 compta
 2016-01-30 12:00:20 +01:00
Laurent Destailleur
e574ebe34c Merge pull request #4514 from hregis/3.8_bug2 
Fix: missing field "label"
 2016-01-30 11:57:28 +01:00
Laurent Destailleur
f5a4b9db31 Merge pull request #4520 from atm-ph/fix_3.8_show_all_shipping_by_socid 
FIX filter by socid if from customer card
 2016-01-30 11:56:40 +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
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
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00