Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
89,109 Commits 36 Branches 189 Tags
9165ea9e673a0e4f743d43a627cda170ce5547eb
Commit Graph

89109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
636f1e642d Fix param of product id to switch to list of order 2020-07-03 01:31:48 +02:00
Laurent Destailleur
fce81a4bf1 Rename var and fix position of checkbox 2020-07-03 01:30:53 +02:00
Laurent Destailleur
c80f1c470f Merge pull request #13788 from simicar29/dev-replenish 
NEW: Add option to include products without alert in replenish
 2020-07-03 01:06:20 +02:00
Laurent Destailleur
6b3eeebe87 Merge branch 'develop' into dev-replenish 2020-07-03 01:03:35 +02:00
Laurent Destailleur
94188af270 Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab 
NEW multiselect type and date to date filter
 2020-07-03 00:57:44 +02:00
Laurent Destailleur
1f466f3846 Update company.lib.php 2020-07-03 00:57:15 +02:00
Laurent Destailleur
4fba3ec872 Merge pull request #14115 from atm-florian/10.0 
fix entity on supplier order
 2020-07-03 00:50:51 +02:00
Laurent Destailleur
03aa4873d1 Merge pull request #14141 from fappels/12_fix_extrafield_html 
FIX html lost on html extrafield
 2020-07-03 00:49:31 +02:00
Laurent Destailleur
b88e159495 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
 2020-07-03 00:46:18 +02:00
Laurent Destailleur
ec98ffb492 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-03 00:41:40 +02:00
Laurent Destailleur
59049cd047 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-03 00:41:32 +02:00
Laurent Destailleur
8d8695ccd7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:41:06 +02:00
Laurent Destailleur
53c5ec51b8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:40:59 +02:00
oscim
ca66eac76c Update project.class.php 
Fix order of delete extra prev table of project
 2020-07-03 00:40:15 +02:00
Laurent Destailleur
f85d240dcf Merge pull request #14145 from oscim/patch-41 
Update project.class.php
 2020-07-03 00:39:45 +02:00
Laurent Destailleur
4f5c5356c5 Merge pull request #14150 from atm-gauthier/9.0_deposit_amount_with_comma 
FIX : create a deposit with amount using comma didn't work
 2020-07-03 00:38:59 +02:00
Laurent Destailleur
18fa4c4105 Update card.php 2020-07-03 00:38:31 +02:00
Laurent Destailleur
fd617658ef Fix syntax 2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d fix #14143 2020-07-03 00:34:50 +02:00
Tim Otte
bce0a93227 Hotfix for an error in v12 2020-07-03 00:33:54 +02:00
Laurent Destailleur
836ccfd595 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-03 00:32:25 +02:00
Laurent Destailleur
751174a983 Merge pull request #14156 from Tim-Otte/fix-proposals-urgent 
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
 2020-07-03 00:32:03 +02:00
Laurent Destailleur
9c504c1b3d Merge pull request #14158 from OPEN-DSI/v10-fix-societe-card-change-selected-fields 
FIX change selected fields on company card
 2020-07-03 00:30:34 +02:00
Laurent Destailleur
cae55da399 Merge pull request #14160 from OPEN-DSI/new-societe-get-sales-representatives-order-by 
NEW add order by lastname and firstname by default
 2020-07-03 00:29:38 +02:00
Laurent Destailleur
a08e4bdf3f Merge pull request #14163 from atm-quentin/FIX_line_reorder_rank_develop 
NEW get all child recursively
 2020-07-03 00:28:32 +02:00
Laurent Destailleur
a44f5376da Update commonobject.class.php 2020-07-03 00:27:30 +02:00
Laurent Destailleur
bc1006e875 Merge pull request #14159 from Je2fb/develop 
FIX #14143 DynamicPrice
 2020-07-03 00:25:38 +02:00
Laurent Destailleur
8109145fe3 Merge pull request #14162 from laurantines/develop 
Update list.php in Adherents
 2020-07-03 00:24:54 +02:00
Laurent Destailleur
0ea55209ae Merge pull request #14165 from ptibogxiv/patch-345 
FIX non numeric value on comm/card.php
 2020-07-03 00:24:32 +02:00
ksar
0a13e03792 FIX : Correct ModuleBuilder left menu 2020-07-03 00:21:39 +02:00
Laurent Destailleur
70b58b5755 Merge pull request #14169 from ksar-ksar/develop 
FIX : Correct ModuleBuilder left menu
 2020-07-03 00:20:59 +02:00
Laurent Destailleur
d24c6f7a81 Merge pull request #14164 from ptibogxiv/patch-344 
FIX takepos 12 hook
 2020-07-03 00:20:28 +02:00
Laurent Destailleur
91266babea Merge pull request #14170 from andreubisquerra/master 
NEW: Appearance tab in TakePOS with more visual parameters
 2020-07-03 00:19:35 +02:00
Laurent Destailleur
75409e3ed0 Merge pull request #14171 from hregis/12.0_bug 
FIX missing possibility to change entity when propal cloning
 2020-07-03 00:18:35 +02:00
Laurent Destailleur
77b0800633 Merge pull request #14172 from atm-quentin/FIX_origin_element_is_always_order 
FIX wrong origin
 2020-07-03 00:15:06 +02:00
Laurent Destailleur
6c01cc16f8 Update commande.class.php 2020-07-03 00:14:22 +02:00
Laurent Destailleur
b1123ab9d1 Merge pull request #14173 from defrance/patch-153 
better look & feel icon on dropdown
 2020-07-03 00:13:29 +02:00
Laurent Destailleur
16b327f106 Debug module credit transfer 2020-07-02 15:45:11 +02:00
BENKE Charlene
b3396a6454 better look & feel icon on dropdown 2020-07-02 14:40:56 +02:00
quentin
642e75c3dd FIX wrong origin 2020-07-02 14:16:31 +02:00
mattsidnell
02445152e3 Merge pull request #11 from Dolibarr/develop 
Update
 2020-07-02 13:01:28 +01:00
Regis Houssin
a5431a40da FIX missing possibility to change entity when propal cloning 2020-07-02 10:16:20 +02:00
Laurent Destailleur
cfcb40dd2a Fix scrutinizer errors 2020-07-02 03:48:32 +02:00
Laurent Destailleur
6b16f64928 Fix properties used that does not exists 2020-07-02 03:39:47 +02:00
Laurent Destailleur
ca769a3c62 Fix scrutinizer errors 2020-07-02 03:37:01 +02:00
Laurent Destailleur
26c6e2d92e Clean code 2020-07-02 03:34:28 +02:00
Laurent Destailleur
46eb744b34 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-02 00:46:07 +02:00
andreubisquerra
452cca503a Fixes 2020-07-02 00:11:17 +02:00
Laurent Destailleur
d76ca6f569 Update doc 2020-07-02 00:09:52 +02:00
Laurent Destailleur
d6ded950ac Update doc 2020-07-02 00:07:18 +02:00