lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,349 Commits 43 Branches 150 Tags 886 MiB
673cf602e9
Commit Graph

52349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
36b0cb5b23 NEW Merge all admin tools (system and module admin tools) into same 
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
 2016-02-16 12:50:15 +01:00
jfefe
134c9d13bc FIX : check contrast of link when using background color for category 2016-02-16 12:45:18 +01:00
Regis Houssin
d55ac472c3 Fix: issue when bank module is disabled 
Fix: missing entity filter for lines of payment
 2016-02-16 11:27:58 +01:00
Laurent Destailleur
a4628e4bd1 Clean deprecated files 2016-02-16 00:41:30 +01:00
Laurent Destailleur
c78997ed23 Tons of fixes and enhancement on recurring invoice generation 2016-02-16 00:31:05 +01:00
phf
86c8998742 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 20:53:06 +01:00
Laurent Destailleur
9cbbf07351 Add fields to link recurring invoice lines with contract origin when it 
comes from this.
 2016-02-15 16:13:33 +01:00
Laurent Destailleur
d715345c82 Debug 2016-02-15 15:07:57 +01:00
Laurent Destailleur
38f7ac29d7 Show vat of lines on template invoices 2016-02-15 14:49:06 +01:00
Laurent Destailleur
23afb80c82 Can remove status recurring or not of template invoice 2016-02-15 14:42:05 +01:00
Laurent Destailleur
f1f5c48337 Uniformize code 2016-02-15 14:27:35 +01:00
Laurent Destailleur
816195cb43 Merge pull request #4600 from aspangaro/3.9-p11 
Modifiy menu for accountancy module - New balance feature
 2016-02-15 13:55:51 +01:00
Laurent Destailleur
be77887477 Merge pull request #4628 from aspangaro/3.8-p2 
Fixed: Correct problem of rights beetween tax and salaries module
 2016-02-15 13:50:06 +01:00
BENKE Charlie
30a6b546b1 containing function prefer use text values instead numeric 2016-02-15 09:23:36 +01:00
BENKE Charlie
79b79e2acc Update card.php 2016-02-15 09:21:21 +01:00
Laurent Destailleur
d4c3258385 Fix missing field 
Fix bad value for default value of next date
 2016-02-15 07:36:45 +01:00
Laurent Destailleur
353fa7c2fc Little cleaning on how options ar shown 2016-02-15 07:12:23 +01:00
Laurent Destailleur
a138c1503a Little cleaning on how options ar shown 2016-02-15 07:04:07 +01:00
aspangaro
d4057c3feb Fixed: Correct problem of rights beetween tax and salaries module 2016-02-15 06:56:51 +01:00
aspangaro
a8ead1d44c Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11 
Correct conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-15 06:31:34 +01:00
Laurent Destailleur
d0b657f6e7 Fix filter on products with spcific prices on thirdrty tab "customer 
prices"
 2016-02-15 02:15:29 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
 2016-02-15 01:37:23 +01:00
Laurent Destailleur
1cf2b1b3af Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-15 01:19:57 +01:00
Laurent Destailleur
c85b7932a9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2016-02-15 01:18:59 +01:00
Laurent Destailleur
051b412c17 Remove security fix 2016-02-15 01:16:01 +01:00
Laurent Destailleur
fdea892e3b Merge pull request #4220 from bafbes/patch-11 
NEW Can change customer on orders when hidden option COMMANDE_CHANGE_THIRDPARTY is on
 2016-02-15 01:14:08 +01:00
Laurent Destailleur
e1d713738f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-15 01:03:09 +01:00
Laurent Destailleur
632080855b Merge pull request #4622 from frederic34/patch-10 
NEW Show link of bank receipt into bank transation list
 2016-02-15 01:02:31 +01:00
Laurent Destailleur
6d4d54a917 Merge pull request #4618 from aspangaro/develop-p6 
Updated: User accountancy code depends on Accounting module, not Salaries module
 2016-02-15 00:59:52 +01:00
Laurent Destailleur
c1c8ead49f Debug multicurrency module 2016-02-15 00:58:51 +01:00
Laurent Destailleur
4d4a35c93f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-15 00:46:20 +01:00
Laurent Destailleur
f2de873e14 git push origin developMerge branch 'atm-ph-new_recurring_invoice' into develop 2016-02-15 00:45:58 +01:00
Laurent Destailleur
e8bc88fffe Merge branch 'new_recurring_invoice' of 
https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:45:39 +01:00
Laurent Destailleur
f1c9a6fe48 Merge pull request #4594 from grandoc/3.9 
default sort should be from A to Z
 2016-02-15 00:39:00 +01:00
Laurent Destailleur
1e0d1d0ca1 Merge pull request #4592 from FHenry/develop 
Accountancy feature
 2016-02-15 00:38:15 +01:00
Laurent Destailleur
0c4d44a86c Merge pull request #4591 from FHenry/3.9 
Accoutancy
 2016-02-15 00:35:24 +01:00
Laurent Destailleur
0d5f30f627 Merge pull request #4589 from frederic34/patch-8 
Update google_oauthcallback.php
 2016-02-15 00:34:22 +01:00
Laurent Destailleur
1cb6c7f3e9 Merge pull request #4603 from GPCsolutions/3.9-4597 
FIX #4597 PHP 7 Uniform Variable Syntax
 2016-02-15 00:32:11 +01:00
Laurent Destailleur
57b9e15976 git push origin developMerge branch 'atm-ph-new_numbering_module_supplier_payment' into develop 2016-02-15 00:31:41 +01:00
Laurent Destailleur
71a12824c9 Merge branch 'new_numbering_module_supplier_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment

Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:31:33 +01:00
abb
7ecb263a04 Merge branch 'develop' of https://github.com/bafbes/dolibarr into dev 2016-02-15 00:20:19 +01:00
Laurent Destailleur
a9aab7545e Merge pull request #4575 from altatof/fix_ttc_display 
FIX: add missing global def for ttc column
 2016-02-15 00:14:34 +01:00
abb
3e6eca546a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev 
Conflicts:
	htdocs/fichinter/card.php
	htdocs/langs/en_US/products.lang
 2016-02-15 00:06:51 +01:00
Laurent Destailleur
51ededc794 Fix duplicate template crabe and crevette. crevette was not updated and 
contains old code compared to crabe. To manage situation invoice with a
PDF, code must be included into crabe (with some test if invoice is a
situation invoice or not to manage if to have different code)
 2016-02-15 00:02:07 +01:00
Laurent Destailleur
3925ae0742 Fix: we loose ability to refresh contact list when changing a company on 
contact tab
 2016-02-14 23:54:07 +01:00
Frédéric FRANCE
5841055d9a Update releve.php 2016-02-14 22:53:00 +01:00
Ion Agorria
a72c49f57b Form changes to add duration info 2016-02-14 22:33:44 +01:00
Laurent Destailleur
2fd01d71cf Fix #4548 Check on stock enough must be done according to warehouse 2016-02-14 22:20:42 +01:00
Laurent Destailleur
04b390f21c Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE 
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
 2016-02-14 21:59:04 +01:00