lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,534 Commits 43 Branches 150 Tags 886 MiB
8690d65479
Commit Graph

65534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
8690d65479 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:47:22 +02:00
Laurent Destailleur
9e397206d3
Merge pull request #9668 from atm-greg/Fix_pdf_generation 
fix error 500 on pdf_generation
 2018-10-04 17:27:29 +02:00
atm-greg
583ea05567 fix missing letter... 2018-10-03 12:13:53 +02:00
Laurent Destailleur
6e7fd15e1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-27 12:48:08 +02:00
Laurent Destailleur
291d477f65 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-27 12:47:48 +02:00
Laurent Destailleur
4c8664b297
Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns 
FIX: showOptionals: column mismatches
 2018-09-27 09:39:51 +02:00
Laurent Destailleur
2d88b69cf6
Merge pull request #9616 from frederic34/patch-14 
add try catch for swiftmailer
 2018-09-27 09:34:21 +02:00
Laurent Destailleur
bc5b794b1a
Merge pull request #9613 from frederic34/patch-11 
FIX Option MAIN_DISABLE_NOTES_TAB #9611
 2018-09-27 09:30:56 +02:00
Laurent Destailleur
77341470e1
Merge pull request #9608 from frederic34/patch-10 
comparaison of two boolean in rssparser.class.php
 2018-09-27 09:23:24 +02:00
Laurent Destailleur
46363a7705
Merge pull request #9607 from atm-gauthier/7.0_fix_replenish_entity 
FIX : need to filter on current entity on replenish
 2018-09-27 09:22:44 +02:00
Laurent Destailleur
ff3f1e933a
Update replenish.php 2018-09-27 09:22:38 +02:00
Marc de Lima Lucio
af93fc7484 FIX: showOptionals: column mismatches 2018-09-26 17:19:06 +02:00
Frédéric FRANCE
1bac3a0ccf
swiftmailer is doing encodetorfc2822 2018-09-26 10:37:20 +02:00
Frédéric FRANCE
92a3faeaf7
add try catch for swiftmailer 2018-09-26 10:13:14 +02:00
Frédéric FRANCE
a9f7bdead6
fix Option MAIN_DISABLE_NOTES_TAB #9611 2018-09-25 15:22:08 +02:00
Frédéric FRANCE
d15c52db3b
Update rssparser.class.php 2018-09-25 08:16:05 +02:00
gauthier
fc7c0ce521 FIX : need to filter on current entity on replenish 2018-09-24 16:23:44 +02:00
Laurent Destailleur
40bed96a01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-24 10:15:20 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:14:38 +02:00
Laurent Destailleur
2dbb82fc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-09-24 10:03:21 +02:00
Laurent Destailleur
12690666e2 Missing trans 2018-09-24 10:03:08 +02:00
Laurent Destailleur
9ddc1770e8
Merge pull request #9501 from atm-gauthier/7.0_fix_tva_if_buyer_hors_cee_and_particulier 
FIX : According to french law, if seller is in France and buyer isn't…
 2018-09-23 15:41:33 +02:00
Laurent Destailleur
1569770855
Rename hidden conf into MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC 2018-09-23 15:41:22 +02:00
gauthier
7b46bedce6 NEW : hidden configuration 2018-09-21 14:35:36 +02:00
Laurent Destailleur
a0bc26a923
Merge pull request #9476 from atm-maxime/fix_invoicelist_creditnote 
Fix invoicelist creditnote
 2018-09-21 09:56:43 +02:00
Laurent Destailleur
779d7e9689
Merge pull request #9568 from atm-gauthier/6.0_fix_langs_fr 
FIX : langs fr
 2018-09-19 15:04:18 +02:00
Laurent Destailleur
9b190d2cbc
Merge pull request #9201 from atm-quentin/FIX_select_element 
FIX exclude element of the select
 2018-09-19 14:55:31 +02:00
gauthier
d62118dca8 FIX : langs fr 2018-09-19 14:53:56 +02:00
Laurent Destailleur
02617bd799 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-19 14:53:07 +02:00
Laurent Destailleur
2b67da3f34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-09-19 14:52:43 +02:00
Laurent Destailleur
d6bd0ed73e
Merge pull request #9566 from frederic34/patch-9 
call to deprecated add_object_linked was present two times
 2018-09-19 14:37:05 +02:00
Laurent Destailleur
a6996169d6
Merge pull request #9565 from frederic34/multicpdf 
correct typo in multicurrency doc pdf #9562
 2018-09-19 14:30:15 +02:00
Frédéric FRANCE
1d43c6bc3a
call to deprecated add_object_linked was present two times 2018-09-19 10:57:59 +02:00
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf 2018-09-19 09:26:56 +02:00
Laurent Destailleur
9c4f582f5c Merge 2018-09-16 12:52:11 +02:00
Laurent Destailleur
5655856ca5
Merge pull request #9504 from atm-gauthier/6.0_fix_refsupplier 
FIX : wrong var name
 2018-09-13 17:55:04 +02:00
gauthier
7838b75ec9 FIX : wrong var name 2018-09-13 16:11:42 +02:00
gauthier
b68523b9c1 FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product 2018-09-13 14:37:12 +02:00
ias-ceo
fece67b629 use correct resultset 2018-09-12 19:00:19 +02:00
Laurent Destailleur
58ba1c3496
Merge pull request #9451 from hregis/7.0_price 
FIX better compatibility with multicompany
 2018-09-12 18:27:50 +02:00
Laurent Destailleur
e3a00c5dcd
Merge pull request #9450 from frederic34/patch-15 
Update accountancycategory.class.php
 2018-09-12 18:25:54 +02:00
Laurent Destailleur
a57e82a300
Merge pull request #9479 from atm-quentin/FIX_character_bill_list 
FIX character making error on bill list
 2018-09-12 18:22:07 +02:00
Laurent Destailleur
a3968b86df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-12 18:05:47 +02:00
Laurent Destailleur
3662ebe3a3 Fix syntax error 2018-09-12 18:05:20 +02:00
Laurent Destailleur
eb242d58f2
Merge pull request #9469 from atm-ph/fix_7.0_classname_colht 
Fix classname liencolht to linecolht
 2018-09-12 17:30:36 +02:00
Laurent Destailleur
fd93a22dca Fix missing field 2018-09-12 16:45:12 +02:00
atm-quentin
c42f39cc34 FIX character making error on list 2018-09-12 14:44:08 +02:00
Maxime Kohlhaas
c94689e9a9 FIX remain to pay for credit note was wrong on invoice list 2018-09-12 11:53:57 +02:00
Laurent Destailleur
aad6a0871f FIX Lose filter on payment type or category after a sort on invoice list 
Conflicts:
	htdocs/compta/facture/list.php
 2018-09-12 10:59:53 +02:00
atm-ph
40c79cb7cd Fix classname liencolht to linecolht 2018-09-11 17:56:11 +02:00