Commit Graph

53716 Commits

Author SHA1 Message Date
Laurent Destailleur
3a28935da3 Merge remote-tracking branch 'origin/3.9' into develop 2016-05-17 01:10:22 +02:00
Laurent Destailleur
95ea20eb44 Clean code for stock movement when lot are used. We should not get
duplicate records into llx_product_batch
2016-05-17 01:10:11 +02:00
Laurent Destailleur
20a2e9394d Fix typo comment 2016-05-16 22:44:11 +02:00
Laurent Destailleur
af38d03825 Clean copyright and libs 2016-05-13 23:22:39 +02:00
Laurent Destailleur
d980742b6c Merge pull request #5057 from nka11/restler3.0.0RC6
Update Restler to 3.0.0RC6
2016-05-13 23:15:16 +02:00
Laurent Destailleur
ae16e6cdca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-13 20:39:44 +02:00
Laurent Destailleur
6a0f16e9aa FIX #5189 2016-05-13 20:39:31 +02:00
Laurent Destailleur
ab27815f21 Merge pull request #5194 from IonAgorria/dolresource-element
Fix: Dolresource element type
2016-05-13 20:32:49 +02:00
Laurent Destailleur
620c8199e5 Merge pull request #5183 from frederic34/patch-7
Correction for Auguria Menu Accounting Expert
2016-05-13 20:28:05 +02:00
Laurent Destailleur
e885fe9f62 Merge pull request #5175 from grandoc/develop
add column numbering name and fix a lot of issues within members list
2016-05-13 20:22:47 +02:00
Laurent Destailleur
d1d1b824b4 Better coding of #5181. I removed need of external lib. 2016-05-13 20:20:48 +02:00
Laurent Destailleur
8aebc37a5f FIX Error message 2016-05-13 19:55:49 +02:00
philippe grand
45bdcd282a add mobile search within member list 2016-05-13 19:24:55 +02:00
Laurent Destailleur
2308d28c19 FIX Add test code to detect/test autoload conflict 2016-05-13 19:23:56 +02:00
philippe grand
23cae18765 add phone perso search within member list 2016-05-13 19:06:28 +02:00
philippe grand
740b6819c7 add phone pro search within member list 2016-05-13 17:49:16 +02:00
philippe grand
cd801fe1dd Merge remote-tracking branch 'upstream/develop' into develop 2016-05-13 14:51:07 +02:00
Laurent Destailleur
e6a95b2af9 Clean code 2016-05-13 14:28:37 +02:00
Laurent Destailleur
62b96b580a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-13 11:22:59 +02:00
nka11
7ec8557db9 remove composer.lock 2016-05-11 23:02:30 +02:00
nka11
018ba1e6c6 fix restler version for RC6 2016-05-11 22:38:16 +02:00
nka11
9f4812e69c upgrade reslter for composer 2016-05-11 22:25:04 +02:00
Ion Agorria
9b11907c70 Update existing linked elements to new type 2016-05-11 18:50:25 +02:00
Ion Agorria
788d499bf6 Change resource type to dolresource in class 2016-05-11 18:50:02 +02:00
nka11
c957cfc260 removing String class which cause server Error with php7 2016-05-11 13:22:58 +02:00
Frédéric FRANCE
3607f1a296 Correction for Auguria Menu Accounting Expert
Entry cause blank windows
2016-05-09 22:15:00 +02:00
Laurent Destailleur
ab6fbb1bca Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-05-09 19:37:58 +02:00
Laurent Destailleur
a8f50283c0 Fix bad translation 2016-05-09 19:37:14 +02:00
Laurent Destailleur
1032583b02 Better support for accessiblity 2016-05-09 14:59:59 +02:00
Laurent Destailleur
9d3ad36b78 NEW If error is reported during migration process, you can ignore it to
avoid to be locked.
2016-05-09 11:06:18 +02:00
Laurent Destailleur
29de09ad7c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-05-09 08:53:38 +02:00
Laurent Destailleur
1835caad7b Better translation 2016-05-09 08:53:09 +02:00
philippe grand
07a10743f8 Fix : inverted columns 2016-05-08 16:20:32 +02:00
philippe grand
f4a533bafa Fix : when MAIN_VIEW_LINE_NUMBER is on 2016-05-08 16:09:00 +02:00
philippe grand
e8bd56a0d7 add new translation 2016-05-08 15:53:01 +02:00
philippe grand
ffe0e2b545 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
update from upstream
2016-05-08 15:48:01 +02:00
philippe grand
a7d13a81f0 Revert "add column numbering name and fix a lot of issues within members list"
changes on the same file by eldy
This reverts commit d5a18ab584.
2016-05-08 15:43:36 +02:00
Laurent Destailleur
6e2443069a Exclude "includes" dir for scrutinizer 2016-05-08 12:48:15 +02:00
Laurent Destailleur
698b93cf1e FIX #5179 2016-05-08 12:38:30 +02:00
Laurent Destailleur
7c3c8f70be Fix not initialized variables 2016-05-08 12:32:18 +02:00
Laurent Destailleur
5cf8612c58 Fix scrutinizer errors 2016-05-08 12:08:23 +02:00
Laurent Destailleur
0eb12f4c61 Fix scrutinizer 2016-05-08 11:39:37 +02:00
Laurent Destailleur
c8d98dbfdc FIX error reported by scrutinizer 2016-05-08 11:33:46 +02:00
Laurent Destailleur
eaa548124b Merge remote-tracking branch 'origin/3.9' into develop 2016-05-08 11:03:51 +02:00
Laurent Destailleur
21a83c7e04 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-05-08 11:02:54 +02:00
Laurent Destailleur
7262dd5934 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-05-08 10:49:09 +02:00
Laurent Destailleur
cb4e569a5f FIX Merge manually PR #5161 - Bad translation key 2016-05-08 10:48:55 +02:00
Laurent Destailleur
1f920bdb55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-07 20:28:29 +02:00
Laurent Destailleur
6bb269381a Merge pull request #5143 from frederic34/morecateg
categories account like other categories
2016-05-07 20:25:17 +02:00
Laurent Destailleur
606b7ef666 Revert "fix:erroneous form tag"
This reverts commit 3093105cd0.
2016-05-07 20:18:46 +02:00