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

72344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
8410d59182 FIX Missing field "In sale" in list 2019-03-14 16:16:50 +01:00
John BOTELLA
31e588dbab fix hookmanager global 2019-03-14 16:13:32 +01:00
Laurent Destailleur
5ccfba1210 FIX Edit of personalized groups 
Conflicts:
	htdocs/accountancy/admin/categories.php
 2019-03-14 16:06:20 +01:00
John BOTELLA
8bc795c055 Fix missing hook for export agenda 2019-03-14 15:19:38 +01:00
Laurent Destailleur
feaca165ad
Merge pull request #10809 from joanlouis/fix-extrafields-calls-from-cards-8 
Fix extrafields calls from cards for Dolibarr 8 See #10803
 2019-03-14 14:22:31 +01:00
Laurent Destailleur
3073567763 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-14 14:17:52 +01:00
Laurent Destailleur
b65c791043 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-14 14:15:45 +01:00
Laurent Destailleur
d7735ff272 FIX #10822 2019-03-14 14:15:35 +01:00
Laurent Destailleur
7b8b6bb02f
Merge pull request #10804 from hregis/9.0_merge 
FIX possibility to set up payment mode when invoice module is disabled
 2019-03-14 14:09:00 +01:00
Laurent Destailleur
9da84f68c7 Bad language file for civility order 2019-03-13 14:23:27 +01:00
Laurent Destailleur
c32551cb62 Fix size of varchar 2019-03-13 13:42:14 +01:00
Laurent Destailleur
88c02143fa Fix missing fields 2019-03-13 13:40:57 +01:00
Laurent Destailleur
c2063c5d0b Fix bad translation 2019-03-12 18:24:55 +01:00
Marc de Lima Lucio
36b44b1348 FIX: several hooks in shipping/delivery cards 2019-03-12 11:28:36 +01:00
Joan Louis
17647de4cc Fix extrafields calls from cards for Dolibarr 8 See #10803 2019-03-12 11:24:54 +01:00
Regis Houssin
47057b431d FIX translation 2019-03-12 07:56:22 +01:00
Regis Houssin
259fa0ac81 FIX check only if invoice module is enabled (bank is check after) 2019-03-12 07:42:25 +01:00
Regis Houssin
94c58072d7 FIX possibility to set up payment mode when invoice module is disabled 2019-03-12 07:29:29 +01:00
Joan Louis
f326c75be7 Update call to extrafields from cards 2019-03-11 21:34:16 +01:00
Laurent Destailleur
15cc21b89f
Merge pull request #10783 from aspangaro/8.0_EBP_export-TXT 
FIX: Accountancy - Format EBP import
 2019-03-11 17:52:34 +01:00
Laurent Destailleur
717cfb350a Typo 2019-03-11 15:45:34 +01:00
Laurent Destailleur
fa4467fb5f FIX Tooltip on click was ko on smartphone 2019-03-09 18:37:07 +01:00
Laurent Destailleur
441b577599 Add missing trans 2019-03-09 12:58:52 +01:00
Alexandre SPANGARO
49f72b6a9a Merge remote-tracking branch 'upstream/8.0' into 8.0_EBP_export-TXT 2019-03-09 05:50:16 +01:00
Laurent Destailleur
57b9be53b3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
 2019-03-09 00:44:31 +01:00
Laurent Destailleur
5596b2e9bf Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-03-09 00:02:56 +01:00
Laurent Destailleur
520387c03d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/holiday/card.php
 2019-03-09 00:01:29 +01:00
Laurent Destailleur
4022d5f529 FIX Can not create contract with numbering module without autogen rule 2019-03-08 23:58:04 +01:00
Laurent Destailleur
233bd4374a Fix phpcs 2019-03-08 19:52:26 +01:00
Laurent Destailleur
1a96a7a88f FIX More complete auto setup of barcode module 
Add tooltip help on member setup module
 2019-03-08 11:31:12 +01:00
Alexandre SPANGARO
d926657534 FIX: Accountancy - Format EBP import 
Add doc
 2019-03-08 10:57:14 +01:00
Laurent Destailleur
f82f29737e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 20:46:14 +01:00
Laurent Destailleur
4135e11138
Merge pull request #10774 from frederic34/patch-3 
phpcs fix v9
 2019-03-07 20:46:02 +01:00
Frédéric FRANCE
d02cec9579
phpcs fix v9 2019-03-07 18:13:21 +01:00
Laurent Destailleur
d88fc8cf91 Fix bad link 2019-03-07 17:32:10 +01:00
Laurent Destailleur
0729a3b571 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:11:12 +01:00
Laurent Destailleur
9a9fd15077 Fix doxygen 2019-03-07 14:10:33 +01:00
Laurent Destailleur
02b8bc94e7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:06:31 +01:00
Laurent Destailleur
d2f1d0cc33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-03-07 14:06:11 +01:00
Laurent Destailleur
e96f84a3d6
Merge pull request #10765 from altatof/sd8 
FIX : supplier discount was not retrieved when choosing a product
 2019-03-07 13:26:44 +01:00