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
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
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
eae5e1d8f0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-10-03 02:49:44 +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
4c28454729
Merge pull request #1934 from GPCsolutions/deps
...
Suggest dependencies needed by PHPExcel
2014-10-03 02:46:38 +02:00
Laurent Destailleur
d455ee7b56
Merge pull request #1933 from atm-maxime/3.5
...
Fix : tva not coming from multiprice
2014-10-03 02:46:22 +02:00
Laurent Destailleur
b5be8ff620
Fix: Avoid error ErrorBadValueForParamNotAString
2014-10-03 02:45:47 +02:00
Laurent Destailleur
ae303f34a4
Merge pull request #1935 from FHenry/3.6_fix
...
3.6 fix - Fix trad currency - Return error message on category creation failure
2014-10-03 02:42:32 +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
