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

46624 Commits

Author SHA1 Message Date
Laurent Destailleur
9511187f6e FIX Change to status "Shipment in progress" for orders is done whane 
validating and not creating a shipment.
 2016-05-27 16:49:55 +02:00
Laurent Destailleur
c653acd4ce Minor fixes 2016-05-27 14:56:59 +02:00
Juanjo Menent
5dec8f1935 Fix: Bad encoding and use original function 'implode' instead aliases 'join' 2016-05-27 10:56:39 +02:00
Laurent Destailleur
7278d1f2c6 NEW Add hidden option BANK_DISABLE_CHECK_DEPOSIT to disable check 
deposit feature.
 2016-05-27 10:38:15 +02:00
Laurent Destailleur
27da82df1f FIX Missing columns in migration 2016-05-26 21:20:10 +02:00
Laurent Destailleur
9a3251bcc9 FIX Missing columns in migration 2016-05-26 21:18:08 +02:00
Laurent Destailleur
db56e1b8a1 FIX Missing columns in migration 2016-05-26 21:17:43 +02:00
Laurent Destailleur
97278c254e Doc comment 2016-05-26 21:12:36 +02:00
Ion Agorria
6ba86e9d03 Fill ref_supplier in product supplier price 2016-05-26 20:53:01 +02:00
Laurent Destailleur
b8d5d6a383 Fix bad placeholder 2016-05-26 19:38:52 +02:00
Laurent Destailleur
b410aa57b9 Fix: Fetching category on label is not enough. We must introduce type 2016-05-25 15:36:48 +02:00
Laurent Destailleur
b476153b8b Move POS at end of top menu 2016-05-25 00:02:48 +02:00
Laurent Destailleur
1617f3c62a Fix colspan 2016-05-24 20:24:51 +02:00
Laurent Destailleur
a587ba496c NEW Can select fields on supplier orders 2016-05-24 18:43:35 +02:00
Laurent Destailleur
9bd9cda224 Move to HTML5 2016-05-24 16:02:43 +02:00
Laurent Destailleur
e0812dddd2 Enhance css 2016-05-24 15:59:56 +02:00
Your Name
c581b05c26 Fix: Update Peru regions and departaments 2016-05-23 18:38:55 +02:00
florian HENRY
37d366478f change trigger position 2016-05-23 14:18:29 +02:00
florian HENRY
4e707af0fd Add demo information and transsaction management 2016-05-23 09:16:47 +02:00
florian HENRY
8afaf07810 Merge remote-tracking branch 'origin/develop' into develop 2016-05-23 08:55:39 +02:00
Laurent Destailleur
f398174772 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/auguria_menu.php
	htdocs/core/menus/standard/eldy.lib.php
 2016-05-22 19:34:27 +02:00
Laurent Destailleur
426454a67b Prepare the hide left menu icon 2016-05-22 19:32:08 +02:00
Xebax
2355a0c38c FIX #5236 Cron module activated but "Modules tools" does not appear in the left menu. 2016-05-22 17:15:22 +02:00
Laurent Destailleur
3119d77565 Add warning on deprecated param 2016-05-22 16:36:48 +02:00
Laurent Destailleur
3df464270c Remove useless code 2016-05-22 16:12:42 +02:00
Laurent Destailleur
ac84ae0ff5 Clean explorer 2016-05-22 15:29:12 +02:00
Laurent Destailleur
382df0d8f1 NEW Rest API token is no more reset at each call. We can reset it with 
param reset=1 on login call.
 2016-05-22 15:20:21 +02:00
Laurent Destailleur
ee3d25d9fa Clean code for REST API. 2016-05-22 15:10:43 +02:00
Laurent Destailleur
11ae76f4fb More neutral picto for EDM module 2016-05-22 14:39:34 +02:00
Laurent Destailleur
5e9809ccb6 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-05-22 14:34:31 +02:00
Laurent Destailleur
d8f717a6e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-22 14:31:50 +02:00
Laurent Destailleur
a9cd73b215 Fix css 2016-05-22 14:31:34 +02:00
Laurent Destailleur
b86b464931 Merge pull request #5233 from IonAgorria/email-template-hook 
NEW Hook for adding new email templates on list
 2016-05-22 14:25:06 +02:00
Laurent Destailleur
3abe1d8e81 Merge pull request #5220 from fmarcet/expenses 
The approved status is enough to expense appear in the report
 2016-05-22 14:22:38 +02:00
Laurent Destailleur
87d26ecef6 Merge pull request #5228 from simnandez/develop 
Fix issues with strict mode
 2016-05-22 14:20:05 +02:00
Frédéric FRANCE
7048191815 Update commande.class.php 2016-05-22 08:57:23 +02:00
Laurent Destailleur
db432e2cc4 Fix lot number 2016-05-21 18:12:03 +02:00
Laurent Destailleur
b95981a2be Fix missing ; at end of sql 2016-05-21 18:03:13 +02:00
Laurent Destailleur
634ebaa3b6 Fix into conf.class.php file we must use $this and not $conf 2016-05-21 16:01:14 +02:00
Laurent Destailleur
6987d3db28 Fix css 2016-05-21 15:03:02 +02:00
Laurent Destailleur
a278fd66d0 Fix color of link for categories 2016-05-21 14:51:33 +02:00
Laurent Destailleur
7935967c62 Fix duplicate translation key 2016-05-21 12:30:58 +02:00
Laurent Destailleur
5fd64c81a6 Missing translation 2016-05-21 12:21:17 +02:00
Laurent Destailleur
a66901d7d5 Enhance css 2016-05-21 12:09:54 +02:00
Laurent Destailleur
075b92b4c3 FIX Field for opportunities must not be visible if option off 2016-05-21 12:06:33 +02:00
Frédéric FRANCE
9e5db0f3c6 Fix next month or next year in opensurvey 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55209-bug-calendrier-opensurvey-v3-9
 2016-05-21 09:18:16 +02:00
Ion Agorria
651b1e1d3a Hook for adding new email templates on list 2016-05-21 03:32:36 +02:00
florian HENRY
acdf781202 change tirrger name to harmonised 2016-05-20 20:12:23 +02:00
florian HENRY
82d6f4c808 add trigger on set draft order 2016-05-20 20:09:30 +02:00
florian HENRY
32a0f4c530 Add trigger into expedition class 2016-05-20 20:03:29 +02:00
Laurent Destailleur
e677390347 Fix bad property name 2016-05-19 22:04:36 +02:00
Laurent Destailleur
e6a78739bd Fix translation from a key that is a numeric 2016-05-19 21:12:09 +02:00
Juanjo Menent
341c70fa87 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-19 21:03:44 +02:00
Juanjo Menent
d8897214cd Fix issues with strict mode 2016-05-19 21:01:52 +02:00
Laurent Destailleur
453937bdfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-19 20:58:41 +02:00
Laurent Destailleur
4298b685d3 Fix css 2016-05-19 20:58:14 +02:00
Laurent Destailleur
61e824726e Merge pull request #5227 from mrsof/patch-9 
Syntax error : bad name of field
 2016-05-19 19:12:11 +02:00
Laurent Destailleur
b636451875 Fix php tag 2016-05-19 19:11:31 +02:00
Laurent Destailleur
afdef9a328 Add css 2016-05-19 18:52:22 +02:00
Laurent Destailleur
b82eabe25f Code comment 2016-05-19 18:52:12 +02:00
Sof
da2c9a0f74 Syntax error : bad name of field 2016-05-19 17:42:57 +02:00
Laurent Destailleur
7087b650d0 More precise parameter parameter targetwithdetails 2016-05-19 17:37:06 +02:00
Your Name
106f456c6b Last change 2016-05-19 16:50:18 +02:00
Laurent Destailleur
d723f26661 Fix css 2016-05-19 13:32:06 +02:00
Laurent Destailleur
9c3b9a8494 NEW: Link on user in leave context reach to leave tab. 2016-05-19 13:25:16 +02:00
Laurent Destailleur
fd38db388a Rename box into widget 2016-05-19 10:05:02 +02:00
Laurent Destailleur
400572e18a Fix column size 2016-05-18 21:04:37 +02:00
Laurent Destailleur
4c2098b667 Fix duplicate table title 2016-05-18 20:58:29 +02:00
Laurent Destailleur
e7072185ab Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:47:57 +02:00
Laurent Destailleur
49c2549400 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:40:09 +02:00
Laurent Destailleur
7cca4f3e8a Merge pull request #5211 from defrance/patch-4 
enhance rappro feature
 2016-05-18 20:38:07 +02:00
Laurent Destailleur
12a5fbbea7 Merge pull request #5191 from FHenry/3.8 
Fix email template edition
 2016-05-18 20:35:42 +02:00
Laurent Destailleur
85cc5cbf02 Merge pull request #5210 from simnandez/3.9 
FIX issues with entity in leave creation
 2016-05-18 20:28:35 +02:00
Laurent Destailleur
24673d066f Merge pull request #5216 from atm-maxime/fix_dispatch_services_on_supplier_order 
FIX services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES
 2016-05-18 20:27:31 +02:00
Laurent Destailleur
28e9460a84 Merge pull request #5226 from joseplluis/patch-1 
Fix bug: filter third parties without categories
 2016-05-18 20:24:22 +02:00
Laurent Destailleur
ee73a91c77 Merge pull request #5218 from atm-florian/develop 
Fix : Advanced Accountancy module
 2016-05-18 20:22:07 +02:00
Josep Lluís
0ad21be132 Fix bug: filter third parties without categories 
There is a bug on filter third parties without categories. No records found.
 2016-05-18 19:27:57 +02:00
Your Name
c2b958a039 Correction compatibility Postgresql 2016-05-18 18:52:38 +02:00
Your Name
23311cdba1 Merge remote-tracking branch 'origin/develop' into expenses 2016-05-18 18:46:05 +02:00
Laurent Destailleur
b1bd6b5d6e Fix regression 2016-05-18 18:23:38 +02:00
Regis Houssin
c7dda59fbc Fix: doublon (merge problem?) 2016-05-18 17:33:51 +02:00
Laurent Destailleur
cf8c180fa4 Fix perm and CRLF 2016-05-18 16:26:15 +02:00
Laurent Destailleur
f3cd4b3ee8 Fix doxygen 2016-05-18 14:43:56 +02:00
Laurent Destailleur
7e66a4cd1d Merge pull request #5221 from atm-florian/dev_fixwarning 
FIX : php strict warning
 2016-05-18 13:58:08 +02:00
Laurent Destailleur
43cb646779 Merge pull request #5219 from fmarcet/3.8 
Fix: Expensereport not compatible with multicompany
 2016-05-18 13:52:45 +02:00
Laurent Destailleur
a4b497ef81 Merge pull request #5212 from atm-alexis/3.8_fix_hook_called_but_not_initialized 
FIX 3.8 hook on group card called but not initialized
 2016-05-18 13:50:21 +02:00
Laurent Destailleur
bba3dc7dcd Make composer cleaner 2016-05-18 13:39:57 +02:00
Laurent Destailleur
9f20779136 Revert "Update escpos-php" 
This reverts commit 2f42a226d0.
 2016-05-18 13:18:55 +02:00
Laurent Destailleur
e7385c9e4f Try to solve side effect of this fuck... autoload creating a big mess in 
a lot of features.
 2016-05-18 11:57:13 +02:00
Laurent Destailleur
e6196f69cd Fix Restler bug returning warnings 2016-05-18 00:45:13 +02:00
Laurent Destailleur
cd75b43d58 Can enable modules during migration 2016-05-18 00:44:55 +02:00
Laurent Destailleur
acae888b3a Fix phpunits 2016-05-17 23:38:07 +02:00
Laurent Destailleur
c8a8474b69 Better practice in boolean comparison 2016-05-17 23:19:57 +02:00
Laurent Destailleur
753c5c7fc4 Fix minor error management 2016-05-17 23:14:30 +02:00
Laurent Destailleur
4e46a01d51 Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED 2016-05-17 22:59:46 +02:00
Laurent Destailleur
89d37ccc62 Fix translation 2016-05-17 21:55:39 +02:00
Laurent Destailleur
a36b780c53 Fix phpunit 2016-05-17 20:30:04 +02:00
Laurent Destailleur
92e7177bcb Fix New into new 2016-05-17 19:58:29 +02:00
Laurent Destailleur
86076c2a01 Fix doxygen 2016-05-17 19:49:37 +02:00
Laurent Destailleur
7bbb3a7da1 Supplier proposal was missing 2016-05-17 19:34:23 +02:00