lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,109 Commits 43 Branches 150 Tags 886 MiB
9165ea9e67
Commit Graph

89109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a71f0e3472
Merge branch 'develop' into fourn 2019-12-19 11:35:02 +01:00
Laurent Destailleur
d1fdd11b37 Close #10907 2019-12-19 11:32:10 +01:00
Frédéric FRANCE
3d19e1321b
NEW upload odt models for proposal 2019-12-19 11:10:55 +01:00
Laurent Destailleur
2ae779a13e Fix can set zero as value for max number of decimal 2019-12-19 11:08:42 +01:00
Laurent Destailleur
ea9d611024
Merge pull request #9924 from hregis/develop_project 
NEW possibility to defined rounding rules by currency
 2019-12-19 10:58:45 +01:00
stickler-ci
863fa7360d Fixing style errors. 2019-12-19 09:57:37 +00:00
Laurent Destailleur
dd0a1b3e10
Merge branch 'develop' into develop_project 2019-12-19 10:56:03 +01:00
Laurent Destailleur
2afaed6981 Fix bad use of MAIN_MAX_DECIMALS_UNIT_ for foreign currencies 2019-12-19 10:50:23 +01:00
Laurent Destailleur
28a172e80f
Merge pull request #9823 from bafbes/abb80035 
NEW:Can change destination of "Back to list" using a "backtolist" parameter
 2019-12-19 10:45:08 +01:00
Laurent Destailleur
fea34fa908 Fix load of CSS using dolibarr server 2019-12-19 10:42:43 +01:00
Laurent Destailleur
43c12db129 Fix load of CSS using dolibarr server 2019-12-19 10:41:59 +01:00
Pierre Ardoin
538921f479
#FIX Error Margin with Situation Invoice 
Fix an issue that show a negative margin when $line->situation_percent is not 100%

Now, the margin price take progress into account.
 2019-12-19 10:35:38 +01:00
Laurent Destailleur
5863319660
Merge pull request #12735 from ptibogxiv/patch-290 
Fix day scale unit
 2019-12-19 10:25:59 +01:00
Laurent Destailleur
e8db3a2aa0 Fix look and feel v11 2019-12-19 10:17:20 +01:00
Laurent Destailleur
38c8b79c54 Fix clear search field 2019-12-19 10:03:10 +01:00
Laurent Destailleur
d9a1e1b348 Fix several non dolibarr behaviour on input of salary payments 2019-12-19 10:01:11 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
db5672ae90 Fix creation/update of expense reports 
Fix export of accounting documents
 2019-12-18 23:07:26 +01:00
Laurent Destailleur
af9d34efca CSS v11 2019-12-18 21:49:28 +01:00
ptibogxiv
6789b7bd1e
Fix day scale unit 2019-12-18 18:23:31 +01:00
Laurent Destailleur
1f76186e1a Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2019-12-18 17:05:35 +01:00
Laurent Destailleur
06f10c14a9 typo 2019-12-18 17:03:43 +01:00
Laurent Destailleur
d9f0100be0
Merge pull request #12734 from Dolibarr/scrutinizer-patch-21 
Scrutinizer Auto-Fixes
 2019-12-18 16:40:28 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Laurent Destailleur
2de16c3c66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-18 14:34:39 +01:00
Laurent Destailleur
3ae87924f1 Fix no user $global $conf into $conf object. 2019-12-18 14:32:23 +01:00
Laurent Destailleur
5012a66ecb
Update viewcat.php 2019-12-18 12:29:52 +01:00
Laurent Destailleur
0f5bf891e2
Update viewcat.php 2019-12-18 12:29:16 +01:00
Laurent Destailleur
ea93c687a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-18 12:26:05 +01:00
Laurent Destailleur
92facbc892
Merge pull request #12726 from atm-gauthier/10.0_fix_units_trad 
FIX : units traductions for selectUnits() function
 2019-12-18 12:21:33 +01:00
Laurent Destailleur
451b32674e Removed duplicate record 2019-12-18 12:15:34 +01:00
Laurent Destailleur
163ba0d480
Merge pull request #12732 from aspangaro/10.0_p11 
Fix language traduction on import/export tools
 2019-12-18 12:05:53 +01:00
Laurent Destailleur
5c24d2ee5e
Merge pull request #12731 from aspangaro/11.0_p2 
Wrong language file load for dashboard
 2019-12-18 10:20:00 +01:00
Alexandre SPANGARO
3fb72c349f Fix language traduction on import/export tools 2019-12-18 03:25:19 +01:00
Alexandre SPANGARO
1fb0d7a0f7 Wrong language file load for dashboard 2019-12-17 22:40:11 +01:00
Laurent Destailleur
cc8a291f28
Merge pull request #12730 from atm-maxime/fix_shipment_close 
Fix prevent double action on shipment close
 2019-12-17 19:35:25 +01:00
Maxime Kohlhaas
3e19702e39 Fix prevent double action on shipment close 2019-12-17 18:05:59 +01:00
Frédéric FRANCE
b6c9de3928
upload odt models for order 2019-12-17 14:49:18 +01:00
Laurent Destailleur
4a734e53a6 Fix column too low. 
Fix automatic event not found if from a module with several objects
 2019-12-17 14:47:58 +01:00
Laurent Destailleur
af4288ff3f FIX #12728 2019-12-17 13:56:32 +01:00
Laurent Destailleur
e7e02f7db7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-17 12:52:20 +01:00
Laurent Destailleur
3207add2a6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/fourn/class/fournisseur.product.class.php
 2019-12-17 12:52:12 +01:00
Laurent Destailleur
27b1e71cd2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-17 12:45:00 +01:00
Francis Appels
95b56f0518
Update 6.0.0-7.0.0.sql 
timestamp NOT NULL can cause SQL error.
 2019-12-17 12:19:35 +01:00
Laurent Destailleur
7b1bf32cd9
Update products.lang 2019-12-17 12:19:32 +01:00
Laurent Destailleur
cdb730cf4a
Merge pull request #12724 from atm-florian/9.0 
fix: task document tab FATAL without thirdparty
 2019-12-17 12:14:55 +01:00
Laurent Destailleur
03bb395ad8
Update document.php 2019-12-17 12:14:30 +01:00
Laurent Destailleur
1a76fd2e80
Merge pull request #12725 from ptibogxiv/patch-289 
fix php error message
 2019-12-17 12:09:19 +01:00
Laurent Destailleur
5aeb667e94 Debug modulebuilder 2019-12-17 12:06:09 +01:00
gauthier
a672673319 FIX : units traductions for selectUnits() function 2019-12-17 11:25:25 +01:00