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

72388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e4e085e332 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-19 13:10:24 +01:00
Laurent Destailleur
dbe15d3685 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-19 13:10:17 +01:00
Laurent Destailleur
b11403103b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:48 +01:00
Laurent Destailleur
8664594fc8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:39 +01:00
Laurent Destailleur
a61ee00a7a
Merge pull request #10877 from ATM-Nicolas/9.0 
FIX : Duplicate executeHook function
 2019-03-19 12:04:46 +01:00
Laurent Destailleur
775aa5ff91
Merge pull request #10870 from hregis/8.0_mc2 
FIX missing entity filter and wrong var name
 2019-03-19 11:11:22 +01:00
Laurent Destailleur
41c737a213 Fix, Oops, test was inverted 2019-03-18 20:16:19 +01:00
Laurent Destailleur
aa013ff753 Fix do we really must copy notes when creating an object from another 
source object? Add a hack with hidden option to be able to change this.
 2019-03-18 20:09:09 +01:00
ATM-Nicolas
1cf42726ff FIX : Duplicate executeHook function 2019-03-18 15:19:39 +01:00
Laurent Destailleur
0c101f3d1b Fix translation 2019-03-18 11:21:51 +01:00
Laurent Destailleur
89087c6847
Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice 
Wrong vat if deposit from propal with multiple vat
 2019-03-18 11:14:11 +01:00
Regis Houssin
57091f08b0 FIX missing entity filter and wrong var name 2019-03-18 10:53:43 +01:00
Laurent Destailleur
34034787af FIX problem with sign of various payment in project preview 2019-03-18 10:16:08 +01:00
Laurent Destailleur
227f5f8f92 Code is cleaner 2019-03-18 09:08:53 +01:00
Laurent Destailleur
e4ed5999eb
Merge pull request #10867 from aspangaro/9.0_various 
FIX: Error with various & salary payment on project
 2019-03-18 09:00:26 +01:00
Alexandre SPANGARO
350f77db2b FIX: Error with various & salary payment on project 2019-03-17 23:00:13 +01:00
Laurent Destailleur
8adc333823 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-16 19:41:50 +01:00
Laurent Destailleur
468af5380f
Merge pull request #10857 from atm-maxime/fix_creditnote_refund 
Fix #9961 : deal with supplier credit note refund like with customers
 2019-03-16 19:40:22 +01:00
Maxime Kohlhaas
46b39dd6a9 Fix #9961 : deal with supplier credit note refund like with customers 2019-03-16 18:13:43 +01:00
Laurent Destailleur
ae35c982af
Merge pull request #9652 from atm-gauthier/7.0_fix_round_debitcredit 
FIX : need to round with 2 decimals to avoid movements not correctly balanced
 2019-03-16 14:27:03 +01:00
Laurent Destailleur
55718cc7da
Merge pull request #10855 from atm-maxime/fix_missing_lang 
Fix #9311
 2019-03-16 13:43:35 +01:00
Laurent Destailleur
efeb7b0c22
Merge pull request #10854 from atm-maxime/fix_civility_third_creation 
Fix #10177
 2019-03-16 13:41:29 +01:00
Maxime Kohlhaas
21e2d36421 Fix #9311 2019-03-16 09:28:47 +01:00
Maxime Kohlhaas
68945c7d51 Fix #10177 2019-03-16 09:11:43 +01:00
Laurent Destailleur
04424ed882 FIX Bad label of status for members (must be short version in list) 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2019-03-15 20:07:42 +01:00
Laurent Destailleur
39e24d30aa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 19:18:30 +01:00
Laurent Destailleur
681d626284 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 19:17:31 +01:00
Laurent Destailleur
4bb45ad1c1
Merge pull request #10824 from atm-gauthier/7.0_fix_nocreateline_deposit_if_amount_zero 
FIX : when we create deposit with multi tva, we mustn't add line if a…
 2019-03-15 19:16:56 +01:00
Laurent Destailleur
b33c366b02
Update card.php 2019-03-15 19:16:49 +01:00
Laurent Destailleur
2e94f8043f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 19:14:02 +01:00
Laurent Destailleur
abf529770d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 19:13:23 +01:00
Laurent Destailleur
482a37a2c9
Merge pull request #10850 from atm-ph/fix_7.0_var_name 
Fix var name
 2019-03-15 19:12:55 +01:00
Laurent Destailleur
6f0fbc42c1 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/members/new.php
	htdocs/public/opensurvey/studs.php
 2019-03-15 15:16:29 +01:00
atm-ph
2da60fb885 Fix var name 2019-03-15 15:15:03 +01:00
Laurent Destailleur
074ba0729a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 11:00:52 +01:00
Laurent Destailleur
84bff41543 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 11:00:24 +01:00
Laurent Destailleur
6c2cad3d48 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/security.lib.php
 2019-03-15 11:00:00 +01:00
Laurent Destailleur
8711e51bce
Merge pull request #10841 from atm-gauthier/6.0_notest_tab_documents_on_expensereport 
FIX : no need to test anything to display documents tabs on expense report
 2019-03-15 10:56:53 +01:00
gauthier
8375b47e74 FIX : in fact expensereport must be in $check array 2019-03-15 10:21:50 +01:00
Laurent Destailleur
c44d9bf8e2 Fix phpcs 2019-03-14 23:27:50 +01:00
Laurent Destailleur
51de29458f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-14 19:06:31 +01:00
Laurent Destailleur
a35a2faacb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/livraison/card.php
 2019-03-14 19:06:21 +01:00
Laurent Destailleur
a8bd8a2101 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-14 18:49:24 +01:00
Laurent Destailleur
5ec8adb7f5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-03-14 18:48:35 +01:00
Laurent Destailleur
4f84a1614c
Merge pull request #10808 from ATM-Marc/FIX_8.0_shipment_hooks 
FIX: several hooks in shipping/delivery cards
 2019-03-14 18:07:57 +01:00
gauthier
3fb6978bc8 FIX : no need to test anything to display documents tabs on expense report 2019-03-14 17:36:49 +01:00
Laurent Destailleur
eab1e13343
Merge pull request #10839 from atm-gauthier/6.0_fix_useless_join 
FIX : useless join
 2019-03-14 17:12:38 +01:00
gauthier
885797b748 FIX : useless join 2019-03-14 17:00:51 +01:00
Laurent Destailleur
42de3a0cde
Merge pull request #10838 from atm-john/9.0_missing_hook_export_agenda 
FIX missing hook in agenda export
 2019-03-14 16:54:55 +01:00
Frédéric FRANCE
b67429218d Update html.formmail.class.php 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2019-03-14 16:52:16 +01:00