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

55867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
972d998f7e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 10:25:03 +02:00
Laurent Destailleur
9ebe704506 Merge pull request #5422 from atm-alexis/FIX_3.9_bug_5128 
FIX #5128 if create method return duplicated code error
 2016-07-21 09:55:26 +02:00
aspangaro
52e5403660 Fix: Presentation on thirdparty card 2016-07-21 06:25:25 +02:00
Laurent Destailleur
a290757d2d Merge pull request #5355 from atm-gauthier/NEW_allow_paiement_on_several_companies_bills_with_same_parentcompany 
NEW Option to allow payment on bills of different companies (with same parent company)
 2016-07-20 19:34:51 +02:00
Laurent Destailleur
e1f3b8e78f Code comment 2016-07-20 19:32:38 +02:00
Laurent Destailleur
548411a3fb Merge pull request #5364 from tysauron/patch-7 
FIX Simplification + get real DN of user from setup of key (multi d…
 2016-07-20 19:15:41 +02:00
Laurent Destailleur
34d1c0af72 Merge pull request #5321 from frederic34/patch-7 
Fix quotes not required on int
 2016-07-20 19:09:09 +02:00
Laurent Destailleur
a37caae098 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-20 19:01:55 +02:00
Laurent Destailleur
b90ed8d677 Merge pull request #5375 from frederic34/charges 
NEW select bank and payment mode for social contrib
 2016-07-20 19:00:10 +02:00
Laurent Destailleur
a75ea2bba6 Merge pull request #5169 from olsesacl/develop-change_fournisseurdet 
FIX: can use LINEORDER_SUPPLIER_CREATE
 2016-07-20 18:55:52 +02:00
Laurent Destailleur
adc9c28369 Merge pull request #5336 from atm-gauthier/develop_new_add_dorade_model 
New: Develop new add dorade model
 2016-07-20 18:31:47 +02:00
Laurent Destailleur
0ff6149741 Merge pull request #4673 from GPCsolutions/develop-forcedinstall 
New: Improved forced install process
 2016-07-20 18:27:39 +02:00
Laurent Destailleur
5a8c08e6cc Merge pull request #5481 from defrance/patch-12 
NEW Add hook "getnomurltooltip" to replace tooltips on getNomUrl functions
 2016-07-20 18:23:35 +02:00
Laurent Destailleur
abfa86d628 Merge pull request #5476 from defrance/patch-11 
NEW Display label and location of event on tooltip
 2016-07-20 18:20:27 +02:00
Laurent Destailleur
6e1d7aebb3 Merge pull request #5504 from simnandez/4.0 
Fix bad param name to test if showing selector for suppliers
 2016-07-20 18:15:54 +02:00
Laurent Destailleur
fd034222b1 Merge pull request #5522 from all3kcis/patch-4 
Update entrepot.class.php
 2016-07-20 18:13:13 +02:00
Laurent Destailleur
c8ff56ac04 Merge pull request #5507 from all3kcis/patch-3 
Debug dol_syslog function
 2016-07-20 18:12:39 +02:00
Laurent Destailleur
dcd84e0310 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-20 18:06:15 +02:00
Laurent Destailleur
366769e97c Merge pull request #5508 from defrance/patch-14 
fix : warning error if no graphfiles
 2016-07-20 18:06:04 +02:00
Laurent Destailleur
699f857a5e NEW Add option PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY to show thirdparty 
on page to submit time.
 2016-07-20 18:02:33 +02:00
All3kcis
7a549b1c32 Update entrepot.class.php 
Add trim on "libelle" in create function of entrepot
 2016-07-20 16:57:26 +02:00
Laurent Destailleur
918bc9cc26 Fix: If user can approve, show button to deny to. 2016-07-20 16:07:15 +02:00
Raphaël Doursenaud
f2a479695e
New: Improved forced install process 
Tamper proofed the process by not relying on POST values for forced fields.
Disabled all fields set when $force_install_noedit is set.
Added a full-featured forced install config file template.

On the side:
Improved Dolibarr root and url detection.
Prevent install locking if install was not successful.
Added missing translation on failed administrator creation.
Better escaping of posted values.
 2016-07-20 14:22:35 +02:00
BENKE Charlie
8830264c0e tooltip not present on picto, already present in $link 
and some case they are conflict
 2016-07-20 02:27:40 +02:00
Laurent Destailleur
ffa1102949 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-20 02:16:22 +02:00
Laurent Destailleur
01c140ecac FIX External user must not be able to edit its discounts 2016-07-20 02:16:10 +02:00
BENKE Charlie
f54bc367a4 fix : warning error if no graphfiles 
append when we have no element present (start from new)
 2016-07-20 01:53:06 +02:00
Laurent Destailleur
3fb80d9678 Merge pull request #5334 from defrance/patch-9 
Replace feature level activation by hidden function
 2016-07-19 18:29:09 +02:00
Laurent Destailleur
455add4130 Merge pull request #5505 from atm-florian/3.9_fix_editbank_invoice 
FIX : cannot update bank account on invoice if module order not activated
 2016-07-19 18:24:40 +02:00
All3kcis
f4705873cb Update functions.lib.php 
Remove useless verification on $level. Second check "in_array" line 624 is sufficient with strict mode.
Otherwise "Emerg level" is not possible with "empty($level).. LOG_EMERG = 0...
 2016-07-19 15:27:03 +02:00
Sergio Sanchis Climent
c101a6c483 update camel caps to update_total() 2016-07-19 13:56:48 +02:00
Sergio Sanchis Climent
76f17737be change dolsyslog 2016-07-19 13:50:32 +02:00
Sergio Sanchis Climent
07b6c991ff Create CommandeFournisseurLigne->insert 
Create SupplierInvoiceLine->insert
 2016-07-19 12:57:23 +02:00
florian HENRY
5ea72c8d56 FIX : cannot update bank account on invoice if module order not 
activated
 2016-07-19 07:46:27 +02:00
Juanjo Menent
7479933c27 Merge remote-tracking branch 'upstream/4.0' into 4.0 2016-07-18 18:44:45 +02:00
Juanjo Menent
c5ebb8f983 Fix bad param name to test if showing selector for suppliers 2016-07-18 18:44:05 +02:00
Juanjo Menent
d2209be6e3 Merge pull request #5501 from defrance/patch-13 
Fix: Add $result on db->free
 2016-07-18 17:15:47 +02:00
BENKE Charlie
093f1da206 Some indenting and hookmanager feature 2016-07-18 15:07:35 +02:00
Laurent Destailleur
038526bb71 Code comment 2016-07-18 14:40:10 +02:00
Laurent Destailleur
fd7c494cb6 Add VAT for cyprus 2016-07-18 13:20:04 +02:00
Laurent Destailleur
2c77a901b3 Fix to avoid removal of trnaslation key to keep 2016-07-18 12:55:44 +02:00
Laurent Destailleur
621a29d0e0 Fix account may contains text 2016-07-18 12:01:25 +02:00
Laurent Destailleur
10cd5ba730 Fix sort of sent notification by date desc 2016-07-18 11:54:35 +02:00
Laurent Destailleur
135bebd9a0 Sort of sent notification by date desc 2016-07-18 11:53:13 +02:00
Laurent Destailleur
9a0367db0d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-07-18 11:51:51 +02:00
Laurent Destailleur
5e654e8cb3 Fix help 2016-07-18 11:49:34 +02:00
Juanjo Menent
e5235be7d0 Merge pull request #5500 from atm-florian/4.0_fix_updateline_multicurrency 
FIX : class FactureLine fetch() and update() crash
 2016-07-18 08:56:15 +02:00
florian HENRY
d3344f5291 sd 2016-07-18 07:48:32 +02:00
florian HENRY
bc4674bdce fix problem with call update method after fetch on invocie lines 2016-07-18 07:37:18 +02:00
BENKE Charlie
260e296f20 add $result on db->free 2016-07-18 02:05:30 +02:00