Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
66,869 Commits 39 Branches 191 Tags
afa9db2a88ba833553621969e2f0bf4cb02c4bb0
Commit Graph

66869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
afa9db2a88 Merge pull request #8752 from delcroip/patch-14 
FIX Add properly the project models
 2018-05-10 11:54:00 +02:00
Laurent Destailleur
4efc9f95cd FIX #8775 (try better fix) 2018-05-10 11:48:18 +02:00
Laurent Destailleur
32868421f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 11:41:30 +02:00
Laurent Destailleur
9e807c1c01 Merge pull request #8751 from wdammak/patch-7 
Add models pdf to warehouse module
 2018-05-10 11:41:03 +02:00
Laurent Destailleur
a4bd8f5722 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 11:39:40 +02:00
Laurent Destailleur
56b80d81dd Declare hook as addreplace hook 2018-05-10 11:39:29 +02:00
Laurent Destailleur
13837fe850 Merge pull request #8750 from altatof/permissions_hook 
NEW add hook for more permissions control
 2018-05-10 11:38:58 +02:00
Laurent Destailleur
9077f18dd6 Update security.lib.php 2018-05-10 11:37:22 +02:00
Laurent Destailleur
8837193545 Merge branch 'develop' into permissions_hook 2018-05-10 11:36:08 +02:00
Laurent Destailleur
bc9eaaab84 Update security.lib.php 2018-05-10 11:34:20 +02:00
Laurent Destailleur
7be804dcf5 Update security.lib.php 2018-05-10 11:32:08 +02:00
Laurent Destailleur
0891766a3e Update security.lib.php 2018-05-10 11:31:27 +02:00
Laurent Destailleur
ea4c48047a All new hooks must be addreplace hooks 2018-05-10 11:30:27 +02:00
delcroix Patrick
a2c93e56ae fixAdd properly the project models 
Previous code was adding only the Task model (project model where actually push during the installation) and only one of the two model available.
 2018-05-06 13:36:37 +02:00
Laurent Destailleur
5fe8249706 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-05-05 23:22:04 +02:00
Laurent Destailleur
a842178689 Fix migration missing steps 2018-05-05 23:20:53 +02:00
Laurent Destailleur
8e729c2021 Add param autostable into generate_filelist_xml.php 2018-05-05 23:12:31 +02:00
Laurent Destailleur
fd53788d2f Add param autostable into generate_filelist_xml.php 2018-05-05 22:54:22 +02:00
Laurent Destailleur
7511ba52ae NEW Suggest link to pay online for customer orders 2018-05-05 22:20:33 +02:00
Laurent Destailleur
f15da0b980 Fix chart of account initial data for syscohada 7.0.2 2018-05-05 22:15:19 +02:00
Laurent Destailleur
4f0e053463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
 2018-05-05 21:58:17 +02:00
Laurent Destailleur
19008531bb Fix packager 6.0.7 2018-05-05 21:56:34 +02:00
Laurent Destailleur
f76df85aec compatibility with ubuntu 14.04 2018-05-05 21:53:02 +02:00
Laurent Destailleur
d4d4f8cc83 Prepare 7.0.2 2018-05-05 20:29:06 +02:00
Laurent Destailleur
b958311819 Prepare 6.0.7 2018-05-05 20:25:06 +02:00
Laurent Destailleur
c34bfc229b Fix syntax error 2018-05-05 19:39:58 +02:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
 2018-05-05 14:40:39 +02:00
Laurent Destailleur
9c68b81f59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/projet/class/task.class.php
 2018-05-05 14:34:54 +02:00
wdammak
c269699679 Add model_pdf to warehouse module 2018-05-05 13:33:34 +01:00
altatof
a8ecce9e6d add hook for more permissions control 2018-05-05 14:31:17 +02:00
Laurent Destailleur
e254d6951d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-05 14:29:54 +02:00
Laurent Destailleur
5eec9efe0c Merge pull request #8749 from bafbes/abb7002 
New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED
 2018-05-05 14:27:28 +02:00
Laurent Destailleur
97f161b276 Update list.php 2018-05-05 14:25:44 +02:00
Laurent Destailleur
8baa529719 Update actions_massactions.inc.php 2018-05-05 14:22:52 +02:00
Laurent Destailleur
aba2ef7ad2 Update actions_massactions.inc.php 2018-05-05 14:22:18 +02:00
Abbes Bahfir
17b8de2cdd New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED 2018-05-05 12:57:29 +01:00
Laurent Destailleur
407343645e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-05 13:57:22 +02:00
Laurent Destailleur
95bd249ec6 Merge pull request #8740 from grandoc/new_branch_04_05_2018 
Clean and update code
 2018-05-05 13:49:54 +02:00
Laurent Destailleur
363eaf0d72 FIX Parameters to triggers must be set into $this->context array. 2018-05-05 13:44:49 +02:00
Laurent Destailleur
bdf4c0704b Removed depreaceted not used method Categorie::get_nb_categories() 2018-05-05 13:40:45 +02:00
Laurent Destailleur
be561a63c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-05 13:36:45 +02:00
Laurent Destailleur
a9c7f90512 Missing hook after deprecated trigger 2018-05-05 13:36:20 +02:00
Laurent Destailleur
e9008e9461 Merge pull request #8734 from grandoc/new_branch_03_05_2018 
clean and update code
 2018-05-05 13:28:47 +02:00
Laurent Destailleur
8b4b786969 Merge pull request #8730 from atm-arnaud/FIX_project_list_label 
FIX label in getnomurl projectlist
 2018-05-05 13:26:11 +02:00
Laurent Destailleur
44cb60e61d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-05 13:25:00 +02:00
Laurent Destailleur
f6ca1eb624 Fix permission name 2018-05-05 13:24:46 +02:00
Laurent Destailleur
c86ca55176 Merge pull request #8727 from ATM-Marc/NEW_conf_thirdparty_tag 
NEW: hidden conf to assign category to thirparty neither customer nor prospect nor supplier
 2018-05-05 13:16:42 +02:00
Laurent Destailleur
352676cd16 Merge pull request #8725 from fappels/Fix_7.0_ProductCombbination 
FIX delete all product variants of a parent product
 2018-05-05 13:14:55 +02:00
Laurent Destailleur
2f79a12c6b Merge pull request #8720 from atm-florian/6.0_pjAndTskCounter 
fix project and task visibility same as list
 2018-05-05 13:13:25 +02:00
Laurent Destailleur
8d52c4f919 Merge pull request #8721 from atm-florian/6.0_fixtaskid 
fix taskid
 2018-05-05 13:13:04 +02:00