Commit Graph

54672 Commits

Author SHA1 Message Date
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
Laurent Destailleur
986119d2b5 Start debug 2016-05-12 21:32:24 +02:00
Laurent Destailleur
55e904bc01 Debug for expert accounting module 2016-05-12 20:45:05 +02:00
Laurent Destailleur
a83a291856 Translation for one char 2016-05-12 19:55:36 +02:00
Laurent Destailleur
2b6029f5d3 FIX Some fix on stock. Condition to view warehouse as column and
protection against infinite loop
2016-05-12 19:44:49 +02:00
Florian HENRY
4cbab1cf47 FIX PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH 2016-05-12 16:58:14 +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
Florian HENRY
d3b3e60d82 Fix email template edition 2016-05-10 22:37:30 +02:00
phf
a57e0f5fd3 Fix update supplier ref on supplier invoice 2016-05-10 14:27:24 +02:00
Florian HENRY
1c0bdfcf1e Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-10 14:15:22 +02:00
gauthier
84e75eed88 FIX : can't fetch by siret or siren because of first "if" 2016-05-10 09:31:25 +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
Maxime Kohlhaas
6278610d0a Fix contract line creation should take desc even if not displayed on screen 2016-05-09 15:32:21 +02:00
Maxime Kohlhaas
03732fd1aa Fix contract line creation was adding all proposal lines desc 2016-05-09 15:31:44 +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
Laurent Destailleur
fe39b00074 Merge pull request #5172 from bafbes/abb-19
fix:erroneous form tag
2016-05-07 20:17:22 +02:00
Laurent Destailleur
0a5863d879 Merge pull request #5177 from simnandez/develop
Fix: Remove unused variables
2016-05-07 20:16:01 +02:00
Laurent Destailleur
9311bb143c Fix missing extrafields in list 2016-05-07 18:54:36 +02:00
Laurent Destailleur
3784af00ea NEW Selection of fields is available on member list 2016-05-07 18:50:05 +02:00
Laurent Destailleur
47f27f353a update list of member 2016-05-07 17:42:34 +02:00
Laurent Destailleur
5bee176ff8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-07 17:12:43 +02:00