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

76011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
aef850f6d3
zapier for dolibarr 2019-05-19 21:12:22 +02:00
Laurent Destailleur
c92994f7ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-19 19:15:28 +02:00
Laurent Destailleur
e84e3ef01f Move module into external module 2019-05-19 19:15:18 +02:00
Laurent Destailleur
27ed095181 Debug BOM module 2019-05-19 16:40:25 +02:00
Laurent Destailleur
2debffe170 Debug modulebuilder for lines 2019-05-19 16:21:11 +02:00
Laurent Destailleur
2900f8828a Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-19 13:52:28 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
d86fc28aba Fix CSS 2019-05-19 13:01:11 +02:00
Laurent Destailleur
3109f8e07a
Merge pull request #11217 from inoveaconseil/FIX11135 
FIX #11135
 2019-05-19 02:23:49 +02:00
Laurent Destailleur
4b3d0ed50c
Update user.class.php 2019-05-19 02:21:42 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Nicolas ZABOURI
61c17f8d0f FIX #11135 2019-05-19 02:06:37 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:06:20 +02:00
Laurent Destailleur
7738787729 Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-05-19 02:03:16 +02:00
Laurent Destailleur
0f3ae6dc39
Merge pull request #11215 from ATM-Marc/FIX_8.0_invoice_default_product_type 
FIX: invoice class: bad SQL request if product type not set
 2019-05-19 01:58:13 +02:00
Laurent Destailleur
2fd3eb8bdf
Update facture.class.php 2019-05-19 01:58:01 +02:00
Laurent Destailleur
91fce6bd2b
Merge pull request #11213 from atm-florian/develop 
fix missing migration sql for ticket now stable on 10
 2019-05-19 01:56:34 +02:00
Laurent Destailleur
684cbbdddb
Merge pull request #11212 from ATM-Marc/FIX_8.0_modulebuilder_foreignkey 
FIX: modulebuilder: hardcoded llx_
 2019-05-19 01:55:02 +02:00
Laurent Destailleur
234ad4c76a
Merge pull request #11214 from atm-maxime/7.0 
Fix #8344
 2019-05-19 01:53:13 +02:00
florian HENRY
7f8c118466 fix: #11015 2019-05-19 01:52:50 +02:00
florian HENRY
272b5f7d6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-19 01:52:14 +02:00
Laurent Destailleur
32485c2782 Fix phpcs 2019-05-19 01:45:33 +02:00
Laurent Destailleur
a4cea5b877 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-19 01:41:53 +02:00
Laurent Destailleur
c6ccb92a51 Fix table shown when there is no perm 
Fix edit admin status of another admin
 2019-05-19 01:41:42 +02:00
ATM-Marc
83c38570e9 FIX: invoice class: bad SQL request if product type not set 2019-05-19 01:01:21 +02:00
Nicolas ZABOURI
2fea95f813 Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-05-19 00:24:18 +02:00
Maxime Kohlhaas
1d980342ec Fix #8344 2019-05-19 00:05:23 +02:00
florian HENRY
c3dbbe51cf fix missing migration sql for ticket now stable on 10 2019-05-18 23:57:00 +02:00
Laurent Destailleur
3e3ed6f9e7 Fix phpcs 2019-05-18 20:11:51 +02:00
ATM-Marc
9b805f742b FIX: modulebuilder: hardcoded llx_ 2019-05-18 20:09:00 +02:00
Laurent Destailleur
34b5399329
Merge pull request #11209 from atm-maxime/fix_holiday_missing_stats 
Fix holiday missing stats
 2019-05-18 19:33:36 +02:00
Laurent Destailleur
b35cdf88e8
Merge pull request #11210 from atm-florian/develop 
fix :email collector for event creation
 2019-05-18 19:31:21 +02:00
Laurent Destailleur
41cb13b1cc Fix warning 2019-05-18 19:28:14 +02:00
Laurent Destailleur
4517d84e3a FIX Disable a module 2019-05-18 19:22:17 +02:00
florian HENRY
099906a73b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-18 18:43:02 +02:00
florian HENRY
0787eee9b8 fix :email collector for event creation 2019-05-18 18:42:46 +02:00
Maxime Kohlhaas
4f64250ad6 Fix menu links for holidays 2019-05-18 17:12:25 +02:00
Maxime Kohlhaas
ea4dcbc77a Add translation 2019-05-18 17:07:55 +02:00
Maxime Kohlhaas
6c195d7bdf Add warning delay for holidays 2019-05-18 17:07:29 +02:00
Maxime Kohlhaas
ea1efa5e88 Fix missing dashboard stats for holidays 2019-05-18 17:06:33 +02:00
Maxime Kohlhaas
28a4785b3a Fix missing TOKEN 2019-05-18 17:06:23 +02:00
Laurent Destailleur
a9e96031de Fix phpcs 2019-05-18 17:04:37 +02:00
Laurent Destailleur
2c78524d4f Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 17:03:33 +02:00
Laurent Destailleur
e46481d837 Fix phpcs 2019-05-18 17:03:21 +02:00
Laurent Destailleur
a1ec074d03
Merge pull request #11205 from ATM-Marc/NEW_supplier_proposal_contact_type 
FIX: add contact types for supplier proposals (Issue #10949)
 2019-05-18 16:56:40 +02:00
Laurent Destailleur
50335179d3
Merge pull request #11208 from atm-florian/develop 
fix:  scrunitizer
 2019-05-18 16:46:49 +02:00
Laurent Destailleur
1ad2c09800 Fix size of popup 2019-05-18 16:38:52 +02:00
Laurent Destailleur
5f598b1c3f Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 16:26:03 +02:00
Laurent Destailleur
b40eb92ce7 Mass action for closing members 2019-05-18 16:25:45 +02:00
florian HENRY
ebe37df9db scrunitizer 2019-05-18 16:19:44 +02:00