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

72858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ca726e6c94 FIX Error generating ODT when option to use contact on doc on 2018-10-31 15:31:22 +01:00
Laurent Destailleur
0ca5da055f Debug v9 2018-10-31 15:04:01 +01:00
Laurent Destailleur
6c4a2728ca Fix build 2018-10-31 12:33:08 +01:00
Laurent Destailleur
19134e82cb Prepare 8.0.3 2018-10-31 12:23:53 +01:00
Laurent Destailleur
693570c48b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2018-10-31 11:50:29 +01:00
Laurent Destailleur
c9ef298839 Fix setup template emails 2018-10-31 11:38:04 +01:00
Laurent Destailleur
ea5b0f53d0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 22:32:54 +01:00
Laurent Destailleur
866729cd21 FIX bad link in notification 2018-10-30 22:32:42 +01:00
Laurent Destailleur
c764d7f8d5 Fix remove var_dump 2018-10-30 21:34:17 +01:00
Laurent Destailleur
a44fbfb2e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 21:30:57 +01:00
Laurent Destailleur
3d16b05fdb Fix fetch 2018-10-30 21:30:44 +01:00
Laurent Destailleur
a183c7d131
Merge pull request #9926 from frederic34/patch-9 
fix display holiday month report if none
 2018-10-30 21:21:28 +01:00
Frédéric FRANCE
46fd3bcaf8
fix display holiday month report if none 2018-10-30 21:15:52 +01:00
Laurent Destailleur
064417dcf1
Merge pull request #9889 from atm-maxime/fix_invoice_from_contract2 
Fix invoice creation from contract was invoicing closed services #9087
 2018-10-30 21:13:38 +01:00
Laurent Destailleur
58bb406724
Merge pull request #9925 from frederic34/patch-9 
fix stats display expensereport
 2018-10-30 21:07:43 +01:00
Frédéric FRANCE
395e9ceae2
fix stats display expensereport 2018-10-30 20:36:12 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
f845a52b20 Fix phpcs 2018-10-30 16:37:50 +01:00
Marc de Lima Lucio
2fbc305683 FIX: task time screen: last fix was overkill 2018-10-30 16:00:56 +01:00
Laurent Destailleur
a3e49f021d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 15:32:25 +01:00
Laurent Destailleur
2c3cd7a668 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSyslog.class.php
 2018-10-30 15:32:09 +01:00
Laurent Destailleur
b9078c6d58 Fix phpcs 2018-10-30 15:30:04 +01:00
Laurent Destailleur
ecdecfcbce Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 15:28:23 +01:00
Laurent Destailleur
2b526f7469 Fix phpcs 2018-10-30 15:28:11 +01:00
Laurent Destailleur
68804cf8a5
Merge pull request #9890 from atm-maxime/fix_import_societe_alias 
FIX missing name alias field in societe import/export #9091
 2018-10-30 15:00:34 +01:00
Laurent Destailleur
4dca94480e
Merge pull request #9892 from atm-maxime/fix_supp_inv_clone 
Fix invoice supplier clone was not getting all lines parameters #9800
 2018-10-30 14:59:48 +01:00
Laurent Destailleur
cb2a5baa45
Merge pull request #9919 from atm-john/Fix_clone_fourn_invoice 
Fix clone fourn order and invoice lines special code
 2018-10-30 14:55:50 +01:00
Laurent Destailleur
0c77f6c3c5
Merge pull request #9918 from bafbes/abb80041 
Fix: To be possibly intercepted : call create, update and delete of the object instead of commonobject
 2018-10-30 14:52:23 +01:00
Laurent Destailleur
c9d00848e6
Merge pull request #9914 from frederic34/patch-27 
make play and playdisable equals
 2018-10-30 14:49:54 +01:00
Laurent Destailleur
2c8b7a4a3d
Merge pull request #9905 from atm-maxime/fix_currency_change 
Fix changing currency in a doc was recalculating amounts in company currency #9801
 2018-10-30 14:48:46 +01:00
Laurent Destailleur
4a71374cf7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 14:48:09 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
afe61579e8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-30 14:28:25 +01:00
Laurent Destailleur
7a268d8d9f Clean code 2018-10-30 14:27:14 +01:00
Laurent Destailleur
a231932972
Merge pull request #9904 from atm-maxime/fix_replenish_qtymin 
FIX replenish wasn't caring about supplier price min quantity #9561
 2018-10-30 14:25:55 +01:00
Laurent Destailleur
0f850cfa3e
Merge pull request #9901 from frederic34/patch-22 
use strict compare
 2018-10-30 14:23:40 +01:00
Laurent Destailleur
76c3bac777
Merge pull request #9900 from frederic34/patch-21 
use strict compare
 2018-10-30 14:23:14 +01:00
Laurent Destailleur
a16e7a84e9
Merge pull request #9899 from frederic34/patch-20 
use strict compare
 2018-10-30 14:23:01 +01:00
Laurent Destailleur
6c9f02e9c6
Merge pull request #9898 from frederic34/patch-18 
use strict compare
 2018-10-30 14:22:19 +01:00
Laurent Destailleur
38396e490a
Merge pull request #9891 from frederic34/patch-17 
Update brouillon when validate order
 2018-10-30 14:17:29 +01:00
Laurent Destailleur
81c70898bf
Merge pull request #9884 from hregis/develop_bug 
FIX $forceentity is not used, replace by $currentobject if needed
 2018-10-30 14:16:29 +01:00
Laurent Destailleur
8ce035fc36
Merge pull request #9894 from librethic-code/patch-1 
FIX: keep external module element when adding resource
 2018-10-30 14:06:38 +01:00
Laurent Destailleur
40cc2157ae
Merge pull request #9902 from frederic34/patch-24 
use strict compare
 2018-10-30 13:58:06 +01:00
Laurent Destailleur
b4c9df65f9 FIX #9907 Can set several modules on ->depends 2018-10-30 13:56:51 +01:00
Laurent Destailleur
d309f22e55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 13:54:25 +01:00
Laurent Destailleur
d4fd55c4cf FIX #9907 2018-10-30 13:54:11 +01:00
Laurent Destailleur
0127682996
Merge pull request #9881 from grandoc/8.0 
merging and typo
 2018-10-30 12:41:56 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email 
FIX the member e-mail on resign and validation.
 2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63
Update functions.lib.php 2018-10-30 12:41:06 +01:00