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
jfefe
6a4468d94e
Not need to test if class exists with require_once
2014-10-06 14:18:28 +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
87fc27c7e6
Avoid missing class error for fetch_thirdparty method
2014-10-06 13:31:01 +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
Maxime Kohlhaas
386f4bd82e
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
2014-10-06 10:05:48 +02:00
Maxime Kohlhaas
48072c58d7
Fix bug 1588 : relative discount not working anymore
2014-10-06 10:05:27 +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
aspangaro
7fa2b6b3eb
Update
2014-10-06 05:34:45 +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
aspangaro
7e11fa06bb
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-05 16:35:38 +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
aspangaro
c1db82a791
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-10-04 08:10:12 +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
05fe8e45b3
Exclude module dire from package
2014-10-03 19:07:49 +02:00
Laurent Destailleur
b85a835988
Prepare 3.6.1
2014-10-03 19:03:58 +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
