Juanjo Menent
dc74302985
Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated
2015-04-18 11:32:01 +02:00
Florian HENRY
6391fd0c40
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-18 11:07:07 +02:00
Florian HENRY
3d8a7ee179
Start email template selector
2015-04-18 11:06:53 +02:00
Maxime Kohlhaas
7aba52c810
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-04-18 10:29:43 +02:00
Laurent Destailleur
deb62f1ffd
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/ajax.lib.php
htdocs/expedition/list.php
2015-04-18 04:18:59 +02:00
Maxime Kohlhaas
e6c5b234fc
Remove debug trace
2015-04-18 03:54:33 +02:00
Laurent Destailleur
aab9b0ec60
Merge pull request #2620 from atm-maxime/develop_cat_multiselect
...
New : categories as multi-select on product
2015-04-18 03:53:05 +02:00
Maxime Kohlhaas
9d8036e5a7
New : categories as multi-select on product
2015-04-18 03:12:42 +02:00
Maxime Kohlhaas
8db50e4606
Fix : menu for product batch
2015-04-18 01:39:41 +02:00
Maxime Kohlhaas
73a66f789c
New : shipment lists by status
2015-04-18 01:21:22 +02:00
Maxime Kohlhaas
3073aab48b
Fix : discount were not working anymore on supplier order and bill
2015-04-17 23:31:51 +02:00
Maxime Kohlhaas
24c3607403
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-04-17 22:58:06 +02:00
Laurent Destailleur
a034cda6ac
Better test
2015-04-17 22:48:39 +02:00
Laurent Destailleur
b8736b0a6f
Merge pull request #2457 from accett/patch-5
...
Update functionsnumtoword.lib.php
2015-04-17 22:42:19 +02:00
Florian HENRY
32e067c806
Remove debug
2015-04-16 14:22:48 +02:00
Laurent Destailleur
e508b28d74
Fix doliforge bug 1707
2015-04-15 18:53:39 +02:00
Laurent Destailleur
bf254baa02
Fix doliforge bug 1707
2015-04-15 18:50:41 +02:00
Laurent Destailleur
8511f1f7ef
Fix the data-role parameter
2015-04-15 18:14:26 +02:00
Laurent Destailleur
799ec63bf7
Merge pull request #2604 from defrance69/patch-57
...
Update modBanque.class.php
2015-04-14 20:05:41 +02:00
Raphaël Doursenaud
54b8aa8a0b
Fixed typo in task export
...
Closes #2607 , #2609
2015-04-14 19:14:16 +02:00
Maxime Kohlhaas
4d119065a8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-04-14 13:01:41 +02:00
Laurent Destailleur
75b3fd442e
Add option to allow to filter list on project creation
2015-04-14 12:32:19 +02:00
BENKE Charlie
aa076b2af6
Update modBanque.class.php
...
added the id of bordereau for link with the cheque
2015-04-14 10:19:41 +02:00
BENKE Charlie
db02cab550
Update modBanque.class.php
...
added fk_bordereau on bank export 1 to link the 2 export
2015-04-14 01:23:42 +02:00
Laurent Destailleur
97cdc55839
NEW Module notification should details of emails into confirm box, not
...
only number.
2015-04-13 17:04:18 +02:00
Laurent Destailleur
d7ef1e7da0
The supplier code was not visible on supplier pdf.
2015-04-13 14:25:27 +02:00
Laurent Destailleur
5dc1102601
Fix object not defined
2015-04-13 13:34:13 +02:00
Laurent Destailleur
ae103e34b8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
2015-04-13 13:08:46 +02:00
Laurent Destailleur
44f10ebec2
Fix: do not add new value
2015-04-13 13:01:23 +02:00
Laurent Destailleur
0e81dc7c6c
Add missing langs
2015-04-13 09:24:39 +02:00
Laurent Destailleur
e036e7baf4
Restore correct filling of page
2015-04-12 19:37:49 +02:00
Laurent Destailleur
c01677af2d
Merge pull request #2588 from defrance69/patch-56
...
Update pdf_paiement.class.php
2015-04-12 19:24:22 +02:00
Laurent Destailleur
8ebad7a395
A serious rewrite of a lot of code to have the module batch number
...
stable.
2015-04-12 17:08:14 +02:00
Laurent Destailleur
1272b03e5e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
74a4bca42c
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-04-11 22:52:27 +02:00
Laurent Destailleur
6889162d7a
Fix: management of vat type 2, 4 and 6 is now ok.
...
Works for canada and ivory cost.
2015-04-11 22:51:53 +02:00
BENKE Charlie
59bff8afac
Update pdf_paiement.class.php
...
Minors bug fix (first page with bad numbering)
improvement compute of number of page
better fillment of page with line (save the tree is good for karma)
2015-04-11 12:22:42 +02:00
Laurent Destailleur
530650b857
Make module productbatch stable
2015-04-10 11:59:41 +02:00
Laurent Destailleur
15531a7ebc
Better title for some boxes
2015-04-10 11:50:57 +02:00
Laurent Destailleur
503a4ff7a0
Enhance filtering for bank transaction and timesheet.
2015-04-09 20:40:49 +02:00
Laurent Destailleur
3ee2790737
Always sho project info when opening task card
2015-04-09 16:26:21 +02:00
braito4
914b324a67
minor bug drag and drop total line in tasks list
2015-04-09 10:37:54 +02:00
Laurent Destailleur
f6c2472d92
fix var not declared
2015-04-08 21:50:17 +02:00
Laurent Destailleur
c4daca2bac
Fix #1682
2015-04-08 21:34:04 +02:00
Laurent Destailleur
ca7a7a9038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/product/stock/product.php
2015-04-08 20:43:51 +02:00
Laurent Destailleur
1bbecc0912
Restore link to stock for products.
2015-04-08 19:26:36 +02:00
Laurent Destailleur
0987aa1c74
Bad trans key
2015-04-08 17:42:28 +02:00
Laurent Destailleur
fc803e7000
Fix permission lost when enabled/disabled module.
2015-04-08 17:33:38 +02:00
Laurent Destailleur
bc69703888
Fix phpcs
2015-04-08 00:07:46 +02:00
