Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-08 10:03:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,979 Commits 37 Branches 191 Tags
718b3b19b45bb7df08bbccbe5518daab0ff237a4
Commit Graph

37826 Commits

Author SHA1 Message Date
Laurent Destailleur
718b3b19b4 Fix: user and date modification not updated 2014-10-20 11:16:51 +02:00
Laurent Destailleur
8d937d2d36 Uniformize position of "Create link" on categories. 2014-10-19 20:37:46 +02:00
Laurent Destailleur
3fe4c58e95 Use span class="badge" for notes. 2014-10-19 19:57:42 +02:00
Laurent Destailleur
9b24cccd0b Fix: Better layout detection 2014-10-19 12:24:36 +02:00
Laurent Destailleur
4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php
 2014-10-18 21:08:09 +02:00
Laurent Destailleur
1d0d3ab747 Merge pull request #1943 from ndrosis/patch-9 
Fix Error when trying to clone an Order
 2014-10-18 16:28:43 +02:00
Laurent Destailleur
9c69ab966f Fix: When closing shipment, status was not visible until refresh. 2014-10-18 16:27:15 +02:00
Laurent Destailleur
0193b31a37 Fix: td balance 2014-10-18 16:18:03 +02:00
Laurent Destailleur
13590a876b Fix: A little clean of dol_hash usage. 2014-10-18 16:08:15 +02:00
Laurent Destailleur
873f8a6f27 If there is at least one favorite into countries, then add a separator 
into list to show limit between sorted entries and not sorted entries.
 2014-10-18 15:53:42 +02:00
Laurent Destailleur
e53c328767 Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:45:44 +02:00
Laurent Destailleur
331e047c6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-18 15:39:24 +02:00
Laurent Destailleur
ad0f842b60 Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into 
atm-maxime-mkoevols

Conflicts:
	htdocs/commande/card.php
 2014-10-18 15:38:49 +02:00
Laurent Destailleur
1f5b64c98e Merge pull request #1964 from frederic34/patch-3 
Use javascript On/Off tosell-tobuy if enabled
 2014-10-18 15:36:17 +02:00
Laurent Destailleur
6bbeaee8fe Fix: Selection of users color was not user owner of event. 2014-10-18 15:35:32 +02:00
aspangaro
9f6a460d42 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 
Resolve conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:32:50 +02:00
Frédéric FRANCE
889dbec97b Use javascript On/Off tosell-tobuy if enabled 2014-10-18 15:07:38 +02:00
Laurent Destailleur
6a9d825a65 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-18 14:57:49 +02:00
Laurent Destailleur
85ce8f8fef Merge pull request #1959 from aspangaro/develop-usercolor 
Add field to select color of the user in user's card
 2014-10-18 14:57:19 +02:00
Laurent Destailleur
90d47cffae Better error management and better error message for reporting upload or 
error of images.
 2014-10-18 14:56:06 +02:00
Laurent Destailleur
97f98d7e16 Merge pull request #1955 from frederic34/patch-2 
Ajax On/Off for product tosell and tobuy
 2014-10-18 14:18:14 +02:00
Laurent Destailleur
79c6d50668 Merge pull request #1962 from IonAgorria/patch-1 
Added date start/end at webservice createOrder
 2014-10-18 14:11:39 +02:00
Laurent Destailleur
fb76fc94b5 Merge pull request #1963 from defrance69/patch-24 
Update functions2.lib.php
 2014-10-18 14:11:25 +02:00
Laurent Destailleur
14ea66f3b7 Legend 2014-10-18 02:31:48 +02:00
Laurent Destailleur
b43d96f86c New: Add id into select_category method. 2014-10-18 02:12:10 +02:00
Laurent Destailleur
58b15fa736 Fix: Solve some regressions 2014-10-18 01:32:38 +02:00
Laurent Destailleur
dbbf31d87b Fix: Restore comaptibility with all languages. 
Fix: Corrupting data function.
 2014-10-18 00:41:21 +02:00
Laurent Destailleur
f7b1115ab0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-18 00:34:23 +02:00
Laurent Destailleur
f49f9e24b7 Removed useless log and removed REQUEST. 2014-10-18 00:34:08 +02:00
Laurent Destailleur
a2d23fd699 Fix: Error management of hook was duplicating errors. 2014-10-18 00:33:30 +02:00
Juanjo Menent
5dbdb50cd7 Trad: Syncro es_ES from Transifex 2014-10-17 20:35:49 +02:00
BENKE Charles
8095bbf809 Update functions2.lib.php 2014-10-17 17:10:12 +02:00
Laurent Destailleur
e2afa48caa Fix: avoid warning 2014-10-17 16:23:32 +02:00
Laurent Destailleur
a99bd1c835 Fix: Fix permission on files. 2014-10-17 15:30:38 +02:00
Laurent Destailleur
4b34455f0a Fix permissions 2014-10-17 15:01:56 +02:00
Laurent Destailleur
fb04b1aedb More spaced cells 2014-10-17 14:47:17 +02:00
Laurent Destailleur
8581e953f9 Doxygen 2014-10-17 14:45:12 +02:00
Laurent Destailleur
5513a44a07 Fix: translation. Use "template" instead of "pre-defined" 2014-10-17 14:17:52 +02:00
Laurent Destailleur
f1e4f35471 Minor fixes on intervention sql 
No style on view for one day.
 2014-10-17 13:09:18 +02:00
Laurent Destailleur
78d289110d Trans: Same verb 2014-10-17 13:07:23 +02:00
Laurent Destailleur
7988532e4e Fix: Bad closing tab on preview pages. 2014-10-17 12:56:54 +02:00
BENKE Charles
589a3fdf95 Update functions2.lib.php 2014-10-17 10:26:34 +02:00
BENKE Charles
5bd665f10d Update functions2.lib.php 
disable entity filter fields for module who not use multicompany fields
 2014-10-17 09:53:17 +02:00
Laurent Destailleur
e2524fbf77 Fxi: Filter on list view was not correct. 2014-10-16 21:34:35 +02:00
aspangaro
b4a9e6a119 Fix :: Administrator not created on new install 2014-10-16 21:14:57 +02:00
aspangaro
01957de5a2 Merge remote-tracking branch 'Upstream/develop' into develop-usercolor 2014-10-16 21:13:14 +02:00
Laurent Destailleur
7a68d9a940 Miscellaneous fixes 2014-10-16 20:55:13 +02:00
Cubexed
08c9ff275a Added date start/end at webservice createOrder 2014-10-16 18:09:16 +02:00
Florian HENRY
eeffe4ed34 Reload object when product clone failed (cause of ref already exists) if 
not done result is blanck pages (header wannot be rewrite (location
herder index.php) around line 1542
 2014-10-16 13:57:07 +02:00
Maxime Kohlhaas
8e3a3500c2 Add comments (for travis' sake) 2014-10-16 13:28:39 +02:00