lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66,854 Commits 43 Branches 150 Tags 886 MiB
a2c93e56ae
Commit Graph

66854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
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
Laurent Destailleur
86697c58d8
Merge pull request #8712 from atm-quentin/develop_categ_filter 
NEW thirdparty categ filter on lists
 2018-05-05 12:56:27 +02:00
Laurent Destailleur
564d791697
Merge pull request #8710 from atm-quentin/develop 
NEW cancel orders on massaction
 2018-05-05 12:54:31 +02:00
Laurent Destailleur
7bb9615cff
Merge pull request #8702 from atm-florian/6.0 
fix accountancy multientity
 2018-05-05 12:53:36 +02:00
Laurent Destailleur
9aaf5b95a7
Merge pull request #8745 from wdammak/patch-5 
Update llx_entrepot add model_pdf
 2018-05-05 12:50:36 +02:00
Laurent Destailleur
667b8c8a50
Merge pull request #8746 from wdammak/patch-6 
Update llx_stock_mouvement Add model_pdf
 2018-05-05 12:50:21 +02:00
wdammak
468f970d32
Update llx_stock_mouvement Add model_pdf 2018-05-04 18:10:55 +01:00
wdammak
e34bd1a222
Update llx_entrepot add model_pdf 2018-05-04 18:08:04 +01:00
Laurent Destailleur
efc00f687a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-04 18:24:13 +02:00
Laurent Destailleur
634e58b7c9 Look and feel v8 2018-05-04 18:24:00 +02:00
Laurent Destailleur
06bad22b31 FIX function not found 2018-05-04 18:12:18 +02:00
Laurent Destailleur
8e2844b295 css 2018-05-04 17:55:29 +02:00
Philippe GRAND
b5f222f45a Clean and update code 2018-05-04 14:14:04 +02:00
Laurent Destailleur
5cff4c152b Add tab "time spent" in project view. Can swith gantt/list. 2018-05-04 11:25:21 +02:00
Laurent Destailleur
1f775c907d Fix translation of % column in gantt view 2018-05-04 11:01:22 +02:00
Philippe GRAND
f3a70a40d7 clean and update code 2018-05-03 21:27:52 +02:00