lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61,516 Commits 43 Branches 150 Tags 886 MiB
448fcae02f
Commit Graph

61516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
448fcae02f Fix: move "fournisseur" in $checksoc 2018-02-12 09:03:53 +01:00
Regis Houssin
abb7e651d1 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug 2018-02-12 09:02:12 +01:00
Laurent Destailleur
4d6f87e544
Merge pull request #8168 from simnandez/6.0 
Fix: Contracts not show price
 2018-02-12 03:13:31 +01:00
Laurent Destailleur
d731857fd0
Update linkedobjectblock.tpl.php 2018-02-12 03:13:12 +01:00
Laurent Destailleur
12f1e4c04b
Merge pull request #8167 from atm-john/fix_contract_line_extrafields_on_save 
Fix Missing insert of extrafields on contract add line
 2018-02-12 02:56:19 +01:00
Laurent Destailleur
d3d3bcaca5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-12 02:53:21 +01:00
Laurent Destailleur
f88874c1f7 Code comment 2018-02-12 02:53:08 +01:00
Laurent Destailleur
5c59f5c63b
Merge pull request #8159 from atm-ph/fix_6.0_cant_update_nblignes_on_pdf_creation 
Fix can't update $nblignes on beforePDFCreation if we update $object->lines
 2018-02-12 02:34:52 +01:00
Juanjo Menent
67ce71bc48 Fix: Contracts not show price 2018-02-09 18:23:11 +01:00
John
2817ace0d2 Fix contract line extrafields save on add line 2018-02-09 15:47:18 +01:00
Regis Houssin
a5814ce779 Fix: nocheck for "fournisseur", already check with "societe" 2018-02-09 11:00:43 +01:00
atm-ph
b074f580db Fix can't update $nblignes on beforePDFCreation if we update $object->lines 2018-02-08 16:59:17 +01:00
Laurent Destailleur
39cd63e2d4
Merge pull request #8143 from simnandez/6.0 
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
 2018-02-08 14:07:14 +01:00
Laurent Destailleur
371b168db1
Merge pull request #8133 from atm-quentin/6.0 
FIX unset categorie
 2018-02-08 13:09:52 +01:00
Laurent Destailleur
3f17c92aa3
Update card.php 2018-02-08 13:09:21 +01:00
Laurent Destailleur
c988d3f1cc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2018-02-08 12:53:26 +01:00
Laurent Destailleur
2e3bb4a585 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-08 12:48:48 +01:00
Laurent Destailleur
414093f94f
Merge pull request #8155 from atm-ph/fix_6.0_pdf_writelinkedobjects_position 
Fix position if module use pdf hook "linkedobjects"
 2018-02-08 12:48:37 +01:00
Laurent Destailleur
8156374005 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-08 12:45:30 +01:00
Laurent Destailleur
a26bb2d884 FIX #8151 2018-02-08 12:41:31 +01:00
atm-ph
6254e20c67 Fix position if module use pdf hook "linkedobjects" 2018-02-07 15:41:39 +01:00
Juanjo Menent
9b56555962 FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page 2018-02-06 18:49:29 +01:00
atm-quentin
d989483d2b Merge branch '60test' into 6.0 2018-02-05 16:10:40 +01:00
atm-quentin
783dc18cd0 Merge 2018-02-05 16:10:19 +01:00
atm-quentin
2081aefc84 FIX creer into lire 2018-02-05 16:07:08 +01:00
atm-quentin
bb93b98260 NEW field commerciaux and categ export CustomersInvoicesAndPayments 2018-02-05 15:25:49 +01:00
Laurent Destailleur
2d4624a1be
Merge pull request #8134 from hregis/6.0_multicompany 
Fix: avoid error -1
 2018-02-05 15:13:31 +01:00
Regis Houssin
839de65012 Fix: avoid error -1 2018-02-05 11:30:31 +01:00
atm-quentin
ae9c7ad6b6 FIX unset categorie 2018-02-05 10:40:52 +01:00
Laurent Destailleur
906a9eaa5a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-04 23:12:57 +01:00
Laurent Destailleur
dbe45d03d3 Fix: amount into form must be numeric without format 2018-02-04 23:12:19 +01:00
Laurent Destailleur
e5cb2be618
Merge pull request #8129 from hregis/6.0_bug 
Fix: remove lines with special code when convert to reduc
 2018-02-04 12:18:20 +01:00
Laurent Destailleur
c4277c1e54
Merge pull request #8128 from hregis/5.0_bug 
Fix: remove lines with special code when convert to reduc
 2018-02-04 12:17:54 +01:00
Laurent Destailleur
f3700b66c6 Fix size of columns when using PRODUCT_USE_UNIT 2018-02-04 11:17:45 +01:00
Laurent Destailleur
fd8f89c708 FIX a discount is a percent, not an amount, so we use vatrate not price 2018-02-04 11:13:47 +01:00
Regis Houssin
8ee1186492 Fix: wrong test 2018-02-04 09:05:35 +01:00
Regis Houssin
d5b7184c8d Fix: wrong test 2018-02-04 09:04:15 +01:00
Regis Houssin
a161ca37ff Fix: use product_type instead special_code 2018-02-04 08:58:31 +01:00
Regis Houssin
c1e6d88442 Fix: use product_type instead special_code 2018-02-04 08:55:51 +01:00
Laurent Destailleur
2114e6ba4e
Merge pull request #8101 from simnandez/6.0 
FIX: #7974 Contract - Invalid reference on the document
 2018-02-03 16:57:22 +01:00
Laurent Destailleur
c9e7e6d925
Merge pull request #8130 from hregis/6.0_bug2 
Fix: compatibility with multicompany sharing
 2018-02-03 16:45:16 +01:00
Juanjo Menent
c434136ba5 Merge remote-tracking branch 'upstream/6.0' into 6.0 2018-02-02 23:44:54 +01:00
Juanjo Menent
464ee6f9d6 Revert 2018-02-02 17:46:25 +01:00
Regis Houssin
13106d34a6 Fix: compatibility with multicompany sharing 2018-02-02 12:36:47 +01:00
Regis Houssin
38d735341c Fix: remove lines with special code when convert to reduc 2018-02-02 10:24:16 +01:00
Regis Houssin
2147bd23e6 Fix: remove lines with special code when convert to reduc 2018-02-02 10:22:47 +01:00
Laurent Destailleur
cba0447cf1
Merge pull request #8117 from atm-quentin/6.0 
FIX update_extras on fourn card
 2018-02-01 15:51:36 +01:00
atm-quentin
c80fa48225 FIX update_extras on fourn card 2018-02-01 09:31:04 +01:00
Laurent Destailleur
bdfbe462df Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-29 21:04:49 +01:00
Laurent Destailleur
8102883356 Fix error when email list contains ', ,' 
Fix output dir of notification
 2018-01-29 20:36:40 +01:00