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

56893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ee14eab802 Multi devise 2016-11-13 18:47:10 +01:00
Laurent Destailleur
b44c746c2e Fix table disabled 2016-11-13 18:31:22 +01:00
Laurent Destailleur
6014345fb7 Fix typo error 2016-11-13 18:28:06 +01:00
Laurent Destailleur
c23ba508f7 Fix type int of subscription 2016-11-13 18:19:52 +01:00
Laurent Destailleur
0f1b34f556 Fix code unreachable 2016-11-13 18:17:49 +01:00
Laurent Destailleur
d42b08231b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-13 18:16:03 +01:00
Laurent Destailleur
fe1c83b206 Fix code not reachable 2016-11-13 18:15:31 +01:00
Laurent Destailleur
7d27e011a5 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-13 17:57:55 +01:00
Laurent Destailleur
502819db76 Fix solve warning 2016-11-13 17:57:18 +01:00
IJ
1d2d21de09 Add PayPal Missing Translation String 
Add PayPal missing translation string to expense report payment type
 2016-11-13 00:36:24 +00:00
Laurent Destailleur
7cf4703b73 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-11-12 22:52:48 +01:00
Laurent Destailleur
74980ba31b git push origin developMerge branch 'aljawaid-develop' into develop 2016-11-12 22:52:08 +01:00
Laurent Destailleur
63162c1bac Merge branch 'develop' of https://github.com/aljawaid/dolibarr into 
aljawaid-develop

Conflicts:
	htdocs/langs/en_US/agenda.lang
	htdocs/langs/en_US/bills.lang
 2016-11-12 22:51:31 +01:00
IJ
c2f1826ac9 Add status 2016-11-12 21:36:47 +00:00
IJ
fd63c91a18 Add Missing Translation String - Expense Report 
Add Debit/Credit Card (text) to Expense Report payment type form fields when used.
 2016-11-12 21:00:21 +00:00
Laurent Destailleur
348e004da6 Minor fixes in css 2016-11-12 16:39:08 +01:00
Laurent Destailleur
04063a62a8 Better responsive 2016-11-12 15:18:38 +01:00
Laurent Destailleur
4bcc7dc8a0 CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu 2016-11-12 14:36:52 +01:00
Laurent Destailleur
f0eceefe48 git push origin developMerge branch 'defrance-patch-20' into develop 2016-11-12 13:37:42 +01:00
Laurent Destailleur
af2f4cf78d Merge branch 'patch-20' of https://github.com/defrance/dolibarr into 
defrance-patch-20

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
	htdocs/install/mysql/tables/llx_facturedet.sql
 2016-11-12 13:36:45 +01:00
Laurent Destailleur
35d80aa209 Miscellaneous fixes 2016-11-12 12:40:06 +01:00
Laurent Destailleur
645eee57db Fix syntax error 2016-11-12 11:22:18 +01:00
Laurent Destailleur
2645b8cd1d Fix syntax error 2016-11-12 11:12:22 +01:00
Laurent Destailleur
7953ea8b4d Merge pull request #5979 from aspangaro/5.0-p35 
Vat expense report integration in reports
 2016-11-12 11:09:58 +01:00
Laurent Destailleur
a5eb445a49 Merge pull request #5978 from aspangaro/4.0-p4 
Fix #5973: EBP export uses simple cote instead of double cote
 2016-11-12 11:02:27 +01:00
Laurent Destailleur
ae36daefbe Merge pull request #5981 from hregis/3.9_bug 
Fix: missing encrypt data for llx_const
 2016-11-12 11:01:47 +01:00
Laurent Destailleur
057a214074 Merge pull request #5982 from hregis/develop_origin 
Fix: missing encrypt/decrypt with llx_const
 2016-11-12 11:00:55 +01:00
aspangaro
8909b4111d Add options on getNomUrl 2016-11-12 10:41:57 +01:00
Regis Houssin
97a8a84b9d Fix: missing encrypt/decrypt with llx_const 2016-11-12 09:57:41 +01:00
Regis Houssin
a1cccc021e Fix: missing encrypt data for llx_const 2016-11-12 09:48:34 +01:00
aspangaro
1dcf02af3a Correct some mistakes 2016-11-12 08:05:25 +01:00
aspangaro
e13e66ce7b Update works 2016-11-12 07:40:08 +01:00
aspangaro
137561aec9 Merge remote-tracking branch 'Upstream/develop' into 5.0-p35 2016-11-12 06:31:06 +01:00
Laurent Destailleur
97d84ab4ab Better responsive design 2016-11-11 23:47:56 +01:00
Laurent Destailleur
b1bd9e4930 Responsive design 2016-11-11 23:17:37 +01:00
Laurent Destailleur
7ccc70e00d Fix as suggested for #5960 2016-11-11 15:29:48 +01:00
Laurent Destailleur
60e0b93ec1 FIX #5972 #5734 2016-11-11 15:29:41 +01:00
Laurent Destailleur
071ba4fbfd Fix as suggested for #5960 2016-11-11 15:27:29 +01:00
BENKE Charlie
eda718a91b Update llx_facturedet.sql 2016-11-11 15:25:19 +01:00
Laurent Destailleur
1082997f62 FIX #5972 #5734 2016-11-11 15:19:25 +01:00
Laurent Destailleur
cd9f1db229 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
 2016-11-11 15:12:30 +01:00
Laurent Destailleur
a605e0b972 Fix phpcs 2016-11-11 15:06:31 +01:00
BENKE Charlie
056e26e595 Update 4.0.0-5.0.0.sql 2016-11-11 15:05:56 +01:00
Laurent Destailleur
e4617ec76c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/filemanagerdol/connectors/php/config.php
	htdocs/viewimage.php
 2016-11-11 15:03:05 +01:00
Laurent Destailleur
fd1c0f404c Merge pull request #5864 from hregis/4.0_bug 
Fix: add possibility to change width type to prevent some display issues
 2016-11-11 14:55:28 +01:00
Laurent Destailleur
614787c123 Merge pull request #5940 from aspangaro/5.0-p33 
Correct typo
 2016-11-11 14:26:33 +01:00
Laurent Destailleur
e82dadedd4 Merge pull request #5974 from defrance/patch-41 
FIX : subscription never filled with "yes"
 2016-11-11 14:25:44 +01:00
Laurent Destailleur
787f508172 More complete fix for #5974 2016-11-11 14:25:22 +01:00
aspangaro
44a6bc8960 Cancel typo profit 2016-11-11 14:19:21 +01:00
Laurent Destailleur
899ba6d90b NEW Add option to include parent products too in stats of orders 2016-11-11 14:17:11 +01:00