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

37974 Commits

Author SHA1 Message Date
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
Frédéric FRANCE
b80b45c086 Update card.php 2014-10-18 15:55:10 +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
Frédéric FRANCE
3a49965820 Update product.php 2014-10-18 15:52:37 +02:00
Frédéric FRANCE
98db599c69 Update card.php 2014-10-18 15:51:05 +02:00
Frédéric FRANCE
96aee6eed4 Update ajax.lib.php 2014-10-18 15:48:59 +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
aspangaro
18426ab8fc Merge remote-tracking branch 'Upstream/develop' into develop-usercolor 2014-10-16 06:36:39 +02:00
aspangaro
c1d016a531 Add field to select color of the user in user's card 2014-10-16 06:20:54 +02:00
Laurent Destailleur
c8dd0383d8 New: Function getCurrencyAmount is marked as deprecated. Use function 
price to output a price including currency symbol.
 2014-10-16 01:26:44 +02:00
Laurent Destailleur
b90011aeb1 Add function dolEscapeXML 2014-10-16 01:21:10 +02:00
aspangaro
2f4822e73b Merge 2014-10-15 20:43:32 +02:00
Laurent Destailleur
ec18bd3845 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-15 18:43:05 +02:00
Laurent Destailleur
38e4100e47 Better translation: Virtual product is a "package product". 2014-10-15 18:21:18 +02:00
Laurent Destailleur
5d57c59241 Fix: Bad parameter of get_substitutionarray_other 2014-10-15 18:16:41 +02:00
Florian HENRY
722f6e0db6 Fix right on product list 2014-10-15 15:24:31 +02:00
Maxime Kohlhaas
737cafef4e Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols 2014-10-15 15:02:36 +02:00
Regis Houssin
a1210da513 Fix: missing entity in unique index 2014-10-14 20:19:02 +02:00
Maxime Kohlhaas
ee4b807a5d Qual : refactoring extrafields display on objects into a single tpl file 2014-10-14 17:00:06 +02:00
Maxime Kohlhaas
68179c8794 Always editable option for extrafields on invoice and order 2014-10-14 16:13:17 +02:00
Maxime Kohlhaas
452636b0e4 New : Add option to allow extrafield to be modified regardless of the document status 2014-10-14 15:27:40 +02:00
aspangaro
861583bb77 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-14 06:12:46 +02:00
Laurent Destailleur
2cf21f856c Fix: table name differs. 2014-10-14 01:47:31 +02:00
Laurent Destailleur
536b579b35 Clean code 2014-10-14 00:27:23 +02:00
Laurent Destailleur
e42ab9ea84 Add legend on peruser view. 2014-10-13 17:45:52 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
Laurent Destailleur
86d25146cc Qual: Indentation muse be done with css and not using multiple   
spaces.
 2014-10-13 00:17:37 +02:00
Laurent Destailleur
e101bfceea Use language to find template email. 2014-10-12 21:24:51 +02:00
Frédéric FRANCE
99dde1ad1e Update card.php 2014-10-12 20:44:50 +02:00
aspangaro
dc6817813e Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-12 20:23:08 +02:00
Frédéric FRANCE
7f308bf9b5 Update productonoff.php 2014-10-12 17:00:42 +02:00
Laurent Destailleur
3bac7c9e11 Add index on new table llx_c_email_template 2014-10-12 16:31:56 +02:00
Frédéric FRANCE
33bb150b44 Update productonoff.php 2014-10-12 16:30:58 +02:00
Laurent Destailleur
8df8fb2fe0 Qual: Removed a lot of duplicate code 
New: extrafields for projects and tasks are exported to ODT documents.
 2014-10-12 16:19:00 +02:00
Frédéric FRANCE
f5f50045d6 Update ajax.lib.php 2014-10-12 16:09:42 +02:00
Frédéric FRANCE
052e507271 Update productonoff.php 2014-10-12 15:56:04 +02:00
Frédéric FRANCE
f25c4f18e6 Update ajax.lib.php 2014-10-12 15:55:18 +02:00
Laurent Destailleur
30e27014b8 Fix: box of customer and propsects were not correctly disabled. 2014-10-12 15:49:14 +02:00
aspangaro
dad9a54959 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-12 15:47:29 +02:00
aspangaro
71dafac03c Add favorite button into country dictionary to put value on top select list 2014-10-12 15:28:01 +02:00
Laurent Destailleur
5c07df812d Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-10-12 15:24:33 +02:00
Laurent Destailleur
cbbe909bc5 Fix: Pb in management of "or" ("|") for permission check. 2014-10-12 15:22:07 +02:00
Frédéric FRANCE
633f01e5a2 Update card.php 2014-10-12 14:26:51 +02:00
Frédéric FRANCE
77d7764215 Create productonoff.php 2014-10-12 14:22:32 +02:00
Frédéric FRANCE
e6e953b4d8 Update ajax.lib.php 2014-10-12 14:20:49 +02:00
Laurent Destailleur
7dab06952c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-12 14:11:39 +02:00
Laurent Destailleur
bba6dc6398 Better contrast 2014-10-12 14:11:16 +02:00
Laurent Destailleur
65f47f7d10 New: Add number of active notification into tab title (like we do for 
notes and documents)
 2014-10-12 12:22:45 +02:00
Laurent Destailleur
f08759a17e Fix: area to generate doc must use half size not onethird. 
Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key
 2014-10-12 11:59:52 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
c5d8012eb1 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/date.lib.php
 2014-10-12 02:13:38 +02:00
Laurent Destailleur
797ab8a150 Merge pull request #1940 from aternatik/fix-cron 
Missing reprogramming task into GUI for cron module.
 2014-10-12 02:10:09 +02:00
Laurent Destailleur
c30f13a03d Fix: label of input method not translated. 2014-10-12 02:07:50 +02:00
Laurent Destailleur
591b40e674 Some fix with export definition. Works now with pgql too. 2014-10-12 01:59:21 +02:00
Laurent Destailleur
a69fb2126c Merge pull request #1861 from defrance69/patch-20 
Update modContrat.class.php
 2014-10-12 01:40:00 +02:00
Laurent Destailleur
13090ed778 Merge pull request #1944 from aspangaro/develop-accounting 
Fix :: Button on/off for account in chart of accounts
 2014-10-12 01:38:40 +02:00
Laurent Destailleur
dad1e312ab Merge pull request #1939 from atm-maxime/3.6 
Fix bug 1588 : relative discount
 2014-10-12 01:37:39 +02:00
Laurent Destailleur
5a8f625ff1 Merge pull request #1942 from fappels/develop 
Fix increase stock on shipment validation
 2014-10-12 01:36:22 +02:00
Laurent Destailleur
5e0c7688d5 Merge pull request #1949 from defrance69/patch-23 
Update product.class.php
 2014-10-12 01:33:37 +02:00
Laurent Destailleur
5f0c2b34dc Merge pull request #1954 from marcosgdf/lowecased-booleans 
Lowercased booleans to fit with PSR-2 specification.
 2014-10-12 01:31:35 +02:00
Laurent Destailleur
44e2cd2194 Prepare code to manage task_datehour with task_date. 2014-10-12 01:20:03 +02:00
Laurent Destailleur
2b479aa0b4 Qual: Uniformize translated label of progress on all pages. 
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
 2014-10-12 01:04:34 +02:00
Marcos García de La Fuente
f7a44347cb Lowecased booleans to fit with PSR-2 specification. 2014-10-12 00:23:19 +02:00
Laurent Destailleur
6c3c1d3a0a Merge pull request #1930 from GPCsolutions/reportprogress 
Allow reporting progress along with timespent
 2014-10-12 00:10:28 +02:00
Laurent Destailleur
fc63e8b9dc Fix: ErrorBadValueForParamNotAString error message in price customer 
multiprice
 2014-10-11 23:55:10 +02:00
Laurent Destailleur
e9881997ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-11 23:50:27 +02:00
Laurent Destailleur
52e1bd2ad1 Merge 2014-10-11 23:46:49 +02:00
Laurent Destailleur
77ed7bf5df Merge branch 'develop-HiddenMailPasswordForgotten' of 
github.com:Devensys/dolibarr into
Devensys-develop-HiddenMailPasswordForgotten

Conflicts:
	htdocs/core/lib/functions.lib.php
 2014-10-11 23:44:50 +02:00
Laurent Destailleur
a9e6e93c59 Merge pull request #1953 from jfefe/patch-6 
Allow to make PUT request with getURLContent() function
 2014-10-11 23:32:25 +02:00
Laurent Destailleur
2800faffa8 Fix: File names must be in lowercase. 
Fix: Missing includes.
 2014-10-11 18:27:30 +02:00
Laurent Destailleur
a804fe62b4 Fix: translation for vi_VN 2014-10-11 15:46:37 +02:00
Laurent Destailleur
cd8936a224 Clean deprecated code. 2014-10-11 15:04:42 +02:00
Laurent Destailleur
0dc82cddf1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/es_ES/accountancy.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/es_ES/categories.lang
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/compta.lang
	htdocs/langs/es_ES/donations.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/holiday.lang
	htdocs/langs/es_ES/interventions.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/es_ES/sendings.lang
	htdocs/langs/es_ES/suppliers.lang
 2014-10-11 14:42:45 +02:00
Laurent Destailleur
8a98f8461d Sync transifex 2014-10-11 14:33:22 +02:00
jfefe
eb06c8a33e Allow to make PUT request with getURLContent() function 2014-10-11 04:25:32 +02:00
Juanjo Menent
f1104275b4 Trad: Syncro es_ES/compta.lang from transifex 2014-10-10 22:11:00 +02:00
Juanjo Menent
2f3abd3774 Trad: Syncro es_ES from transifex 2014-10-10 21:50:05 +02:00
Regis Houssin
c01edd76f6 Fix: avoid warning 2014-10-10 16:53:21 +02:00
Andrelec1
269b960d9a Add support tld with dots 2014-10-10 15:18:24 +02:00
Andrelec1
f4f1f45d5a copyright and annotation 2014-10-10 15:01:10 +02:00
Andrelec1
7978b4503d Add function hideMail and use 2014-10-10 14:57:07 +02:00
aspangaro
4f024acc3e Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-10-10 05:31:08 +02:00
BENKE Charles
00c5c940c9 Update product.class.php 
Label of product on tooltip is more usefull than the ref who's already on the link
 2014-10-09 21:31:35 +02:00
Laurent Destailleur
00fd9acf31 Fix: Bad length of field 
Transifex sync
 2014-10-09 18:32:23 +02:00
Laurent Destailleur
e76b5a370d Fix: bad parameter 2014-10-09 17:27:14 +02:00
Laurent Destailleur
31a96aa4c6 Fix: CRLF 2014-10-09 17:18:14 +02:00
Laurent Destailleur
a19e8aa89d Sync transifex 2014-10-09 17:15:15 +02:00
Laurent Destailleur
60a6e2a579 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-09 17:06:13 +02:00
Laurent Destailleur
06cc08026b Some fix on per user view. 2014-10-09 17:05:57 +02:00
Maxime Kohlhaas
4fd67d725a Fix bug 1588 : relative discount not working anymore 2014-10-09 13:58:43 +02:00
Laurent Destailleur
0390085f54 Style for install match css of login. 2014-10-09 13:47:40 +02:00
aspangaro
417fd13663 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-10-09 04:56:27 +02:00
Laurent Destailleur
f9377a4715 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-08 20:57:11 +02:00
Laurent Destailleur
de5005ca54 Fix: Avoid duplicate error message 
Fix: pgsql syntax error
 2014-10-08 15:35:39 +02:00
Laurent Destailleur
4c4485d0ee More comment to explain and remove a todo. 2014-10-08 15:24:35 +02:00
Laurent Destailleur
56f5c666cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-08 15:09:32 +02:00
Laurent Destailleur
168b0db094 Fix: button must be align to right 2014-10-08 15:09:07 +02:00
Regis Houssin
cc553514af Fix: add constant MAIN_OVERWRITE_THEME_PATH if the theme does not have 
the same name as the module
 2014-10-08 14:51:16 +02:00
aspangaro
b8a40a1b32 Presentation 2014-10-08 06:24:46 +02:00
Laurent Destailleur
2bbede6465 New: Can add product into category from category card. 2014-10-07 21:39:10 +02:00
Laurent Destailleur
0a4d040e9d Fix: Warning sur traduction 2014-10-07 21:15:14 +02:00
aspangaro
95dc569fe2 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-10-07 20:51:59 +02:00
aspangaro
e8ac6567b7 Fix :: Button on/off for account in chart of accounts 2014-10-07 20:50:57 +02:00
Juanjo Menent
75eb61702e Fix: Showing accounting account fails 2014-10-07 12:46:05 +02:00
Drosis Nikos
0c7cabbf37 Fix Error when trying to clone an Order 2014-10-06 16:15:11 +03:00
Laurent Destailleur
cfc5bb845a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-06 14:49:10 +02:00
Francis Appels
1e6240953e Fix increase stock on shipment validation 
$obj not set.
Re-enabled delete button for shipment with batches, was increase issue,
not decrease issue.
 2014-10-06 14:10:27 +02:00
jfefe
fdbf2fb45d Missing reprogramming task into GUI for cron module. 
Without this, a new task is never executed (because without datenextrun defined)
 2014-10-06 13:28:07 +02:00
Regis Houssin
3ddcac5ced Fix: missing $ismultientitymanaged 2014-10-06 09:12:19 +02:00
Regis Houssin
692881bf59 Fix: missing $ismultientitymanaged 2014-10-06 09:07:09 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
a2fed6f214 Fix: miss dol_fiche_end 2014-10-05 23:26:42 +02:00
Laurent Destailleur
60f643cf1a Change comented log to help debug 2014-10-05 20:26:35 +02:00
Laurent Destailleur
c73f4a14ee Fix: Bad days returned by function 2014-10-05 16:17:09 +02:00
Laurent Destailleur
742d0e37ee Fix: Bad month return by function 2014-10-05 12:54:51 +02:00
Laurent Destailleur
968b021985 Fix trad and sql error 2014-10-05 05:37:01 +02:00
Laurent Destailleur
3b6c533b85 Fix translation 2014-10-05 05:13:46 +02:00
Laurent Destailleur
81c28f528d Fix translation 2014-10-05 05:13:09 +02:00
Laurent Destailleur
85f0d6c3ea Fix: Edition of event 2014-10-05 04:51:34 +02:00
Laurent Destailleur
bb852592e6 Fix: Restore broken feature. One hook = One call of function per module. 2014-10-05 04:49:46 +02:00
Laurent Destailleur
c51b964b19 Fix: Pb when showing availability 2014-10-05 03:44:20 +02:00
Laurent Destailleur
5c5f725a34 Fix scrutinizer 2014-10-05 01:22:17 +02:00
Laurent Destailleur
11d1be882c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/list.php
 2014-10-04 17:32:01 +02:00
Laurent Destailleur
5601c979ab New: Can search list of thirdparties from web service on part of name. 2014-10-04 17:29:04 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
69475b7bf8 Sync from transifex. 
Fix var not initialized.
 2014-10-04 12:49:30 +02:00
Laurent Destailleur
e70aebf2c7 Merge pull request #1937 from fappels/develop 
Expedition lines from same orderline merged.
 2014-10-04 00:58:19 +02:00
Laurent Destailleur
d9f898ab8c Merge pull request #1916 from FHenry/develop 
Add feature to order to invoice on supplier part
 2014-10-04 00:31:11 +02:00
Laurent Destailleur
02512180e0 Sync from transifex 2014-10-03 19:21:45 +02:00
Laurent Destailleur
d518278166 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture/class/facture.class.php
 2014-10-03 19:17:28 +02:00
Laurent Destailleur
dde3b3ef65 Fix: Event update 2014-10-03 18:25:38 +02:00
Laurent Destailleur
f9d78c0c57 Fix: edit event 
New: Can use color of type of event into dictionnary.
 2014-10-03 18:04:13 +02:00
Laurent Destailleur
e7a9447d94 Add hook formatEvent and fix bug into per user view. 2014-10-03 15:58:08 +02:00
Francis Appels
269df77873 Fix migration sql for inserting accounting records 
Migration SQL could not insert accounting records because datec was set
to NOT NULL
 2014-10-03 12:59:33 +02:00
Laurent Destailleur
844b5f30df Minor look enhancement 2014-10-03 12:54:29 +02:00
Laurent Destailleur
cbd48f5129 Add missing picto 2014-10-03 12:48:24 +02:00
Francis Appels
bcc5bebd77 Fix deliveryorder qty and remainingqty positions 2014-10-03 12:28:42 +02:00
Francis Appels
840a98d8ac Expedition lines from same orderline merged. 
When there are more expedition lines from same orderline key, merge them
and get source warehouses. Usefull future possibility for creating
shippinglines with same products from multiple warehouses.
@KreizIT also changed some batch related items.
 2014-10-03 12:20:02 +02:00
Laurent Destailleur
166853dd56 Fix: miscellaneous bugs 2014-10-03 12:15:21 +02:00
Laurent Destailleur
bc1279ccfa Brighter button. We use CSS and no more image. 2014-10-03 11:27:12 +02:00
Laurent Destailleur
1b0b49cceb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-03 03:53:11 +02:00
Laurent Destailleur
494e6786b3 Fix: Translation 2014-10-03 03:52:50 +02:00
Laurent Destailleur
a853aed348 Fix: Some fields not visibles. Wrong value for calculated time. 2014-10-03 03:42:11 +02:00
Laurent Destailleur
868809caba Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-10-03 03:22:37 +02:00
Laurent Destailleur
33ddbd7425 Merge pull request #1932 from Xebax/develop 
Fix bug #1604: "When a member is created, the birthday is not recorded" and bug #1610: "Civility is not displayed".
 2014-10-03 03:17:45 +02:00
Laurent Destailleur
c69565fd69 Fix: column name should not be an numeric 2014-10-03 03:12:39 +02:00
Laurent Destailleur
ebd86f5388 Merge pull request #1931 from ndrosis/patch-8 
Fix Lang for Payment Type
 2014-10-03 02:47:25 +02:00
Laurent Destailleur
b5be8ff620 Fix: Avoid error ErrorBadValueForParamNotAString 2014-10-03 02:45:47 +02:00
Laurent Destailleur
5ac63ec534 Solve fixme. 2014-10-03 02:00:50 +02:00
Laurent Destailleur
7fb2d4d1c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-03 01:48:28 +02:00
Laurent Destailleur
8bc57e38d1 Uniformize, support, install and login page with a more neutral 
background (nearest bootstrap). Remove image background.
 2014-10-03 01:48:14 +02:00
Florian HENRY
4b28ff005e Return error message on category creation failure 2014-10-02 15:24:40 +02:00
Florian HENRY
d6fc967162 Merge branch '3.6' into 3.6_fix 2014-10-02 15:22:23 +02:00
Florian HENRY
78ec4d595b Fix trad currency 2014-10-02 15:21:49 +02:00
Regis Houssin
4248c7bed2 Fix: strict mode paradise 2014-10-02 09:30:31 +02:00
Regis Houssin
30221ae8cf Fix: missing fields 2014-10-02 09:00:40 +02:00
Regis Houssin
2425fdfadd FIXME $socid is not defined (strict mode) 2014-10-02 08:44:49 +02:00
Regis Houssin
1541be8790 FIXME $key is not defined (strict mode) 2014-10-02 08:40:51 +02:00
Xebax
add55e480e Fix bug #1610: Civility is not displayed. 2014-10-01 22:00:45 +02:00
Raphaël Doursenaud
769d824e7b Allow reporting progress along with timespent 2014-10-01 14:12:47 +02:00