Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

72264 Commits

Author SHA1 Message Date
Laurent Destailleur
5a17289e75 Fix crop for proposal image 2019-12-03 18:04:58 +01:00
Laurent Destailleur
576006ff6c Merge pull request #12605 from atm-john/10.0_fix_exif_images 
Fix Use dynamically exif image information with conf MAIN_USE_EXIF_ROTATION
 2019-12-03 17:57:19 +01:00
John Botella
e46f654e9f Fix deprecated image2wbmp function 2019-12-03 17:27:13 +01:00
Frédéric FRANCE
650c9c2e57 Update product.class.php 2019-12-03 16:46:50 +01:00
gauthier
cec54d6ce0 FIX : when we need to bill several orders, order lines unit is not on bill lines 2019-12-03 16:40:35 +01:00
Laurent Destailleur
606a13898c Merge pull request #12394 from mapiolca/patch-15 
Fix problem of display photo in the model
 2019-12-03 16:16:57 +01:00
Laurent Destailleur
6bc8a90680 Merge pull request #12615 from frederic34/patch-6 
select_product_fourn_price returns void
 2019-12-03 16:13:14 +01:00
Laurent Destailleur
2c86aab9ca Fix responsive 2019-12-03 15:22:46 +01:00
Frédéric FRANCE
85d8d2ff58 select_product_fourn_price returns void 2019-12-03 15:19:58 +01:00
Laurent Destailleur
474057de1f Fix reponsive 2019-12-03 15:12:18 +01:00
Laurent Destailleur
7a1a932755 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/main.inc.php
 2019-12-03 15:03:10 +01:00
Laurent Destailleur
d153918a10 Fix trans 2019-12-03 15:00:52 +01:00
Laurent Destailleur
78acf07e4c Fix bad side effect of debugbar with android 2019-12-03 14:59:05 +01:00
Laurent Destailleur
d6ef77e895 Merge pull request #12603 from atm-florianm/NEW_9.0_mysqldump_export_enable_using_--quick_option 
NEW 9.0: enable user to use the mysqldump '--quick' option
 2019-12-03 14:36:01 +01:00
Laurent Destailleur
41a176ce72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/modules/modStripe.class.php
	htdocs/product/stock/replenish.php
	htdocs/stripe/payout.php
 2019-12-03 13:58:15 +01:00
Laurent Destailleur
cb62844472 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-03 13:52:53 +01:00
Laurent Destailleur
eb5a2bd1a5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/user/card.php
 2019-12-03 13:52:42 +01:00
Laurent Destailleur
072db96b11 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-03 13:48:38 +01:00
Laurent Destailleur
6ac5e1a4f3 Merge pull request #12601 from TobiasSekan/FixAddFolderSymbolAccess 
Fix style of add folder button based on rights
 2019-12-03 13:46:21 +01:00
Laurent Destailleur
2d95544abd Update filemanager.tpl.php 2019-12-03 13:46:12 +01:00
Laurent Destailleur
b1f2495771 Merge pull request #12598 from frederic34/patch-15 
The property db does not exist on mod_livraison_saphir
 2019-12-03 13:26:16 +01:00
Laurent Destailleur
87aaa5b11d Merge pull request #12597 from frederic34/patch-14 
The property db does not exist on mod_supplier_proposal_saphir
 2019-12-03 13:26:03 +01:00
Laurent Destailleur
9400d44f83 Merge pull request #12596 from frederic34/patch-13 
The property db does not exist on mod_reception_moonstone
 2019-12-03 13:25:51 +01:00
Laurent Destailleur
a56d4407ca Merge branch 'develop' into patch-11 2019-12-03 13:25:19 +01:00
Laurent Destailleur
573aac8b04 Merge pull request #12594 from frederic34/patch-8 
The variable xxx does not seem to be defined for all exec paths
 2019-12-03 13:22:18 +01:00
Laurent Destailleur
5835d49ae1 Merge pull request #12613 from ptibogxiv/patch-288 
Fix title of transactions list
 2019-12-03 13:22:02 +01:00
Laurent Destailleur
8f39fec121 Merge pull request #12600 from TobiasSekan/FixEcmSymbolsAccess 
Fix shown ECM symbols on missing access
 2019-12-03 13:21:42 +01:00
Laurent Destailleur
d93cfedcbe Merge pull request #12602 from TobiasSekan/AddMoreFilesForPreview 
Add preview button for MD, CSS, XAML files
 2019-12-03 13:20:08 +01:00
Laurent Destailleur
e08eca2bf9 Merge pull request #12611 from ptibogxiv/patch-287 
Fix stripe menu
 2019-12-03 13:19:22 +01:00
Laurent Destailleur
7a22859f4f Merge pull request #12606 from frederic34/patch-17 
functions return void
 2019-12-03 13:19:03 +01:00
Laurent Destailleur
ed462190f6 Merge pull request #12607 from frederic34/patch-18 
doxygen
 2019-12-03 13:18:48 +01:00
Laurent Destailleur
a00d011f10 Merge pull request #12609 from frederic34/patch-20 
Update product.class.php
 2019-12-03 13:18:29 +01:00
Laurent Destailleur
e47edb2c98 Merge pull request #12592 from frederic34/patch-6 
The variable $error seems to be never defined
 2019-12-03 13:17:18 +01:00
Laurent Destailleur
37cee5840a Merge pull request #12608 from frederic34/patch-19 
$id parameter was removed long time ago
 2019-12-03 13:17:01 +01:00
ptibogxiv
636da4518f Fix title of transactions list 2019-12-03 11:22:00 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
John Botella
f806c0da78 Fix comment missing 2019-12-03 09:29:04 +01:00
John Botella
2b01576aa9 Fix comment 2019-12-03 09:24:11 +01:00
ptibogxiv
b67fb8be02 Fix stripe menu 2019-12-03 00:14:05 +01:00
ptibogxiv
15715aa12c FIX not fee in payout list 2019-12-02 23:53:01 +01:00
Frédéric FRANCE
ac674aae6a Update product.class.php 2019-12-02 20:45:28 +01:00
Frédéric FRANCE
579f570abf $id parameter was removed long time ago 2019-12-02 20:42:48 +01:00
Frédéric FRANCE
261e166029 doxygen 2019-12-02 20:18:12 +01:00
Frédéric FRANCE
09b8f321ce functions return void 2019-12-02 20:16:35 +01:00
John Botella
3b72cade4e Fix exif image with conf MAIN_USE_EXIF_ROTATION 2019-12-02 17:32:06 +01:00
Florian Mortgat
4846885eea NEW 9.0: enable user to use the mysqldump '--quick' option 
(useful if the server has low RAM or large tables)
 2019-12-02 16:54:05 +01:00
Laurent Destailleur
b317530b39 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-02 15:23:48 +01:00
Laurent Destailleur
c692650430 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-02 15:23:40 +01:00
Laurent Destailleur
310e65b93c Work on MRP cration 2019-12-02 15:23:21 +01:00
Laurent Destailleur
66571df449 Fix remove a link that is private 2019-12-02 15:19:14 +01:00