Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 11:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
47,690 Commits 36 Branches 190 Tags
05a7ab158b51a05dbb38ac7b02abf0d2c1df9891
Commit Graph

845 Commits

Author SHA1 Message Date
Laurent Destailleur
4319cd63a3 Working on finishing of look 2015-05-22 14:28:02 +02:00
Laurent Destailleur
03acb1a8c9 Uniformize way to report error after "buildoc" action. 2015-05-19 00:01:30 +02:00
Florian HENRY
4bc2d55cb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 17:37:31 +02:00
Laurent Destailleur
5937cd7f70 NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
Florian HENRY
8e61a03b5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-12 21:02:36 +02:00
Raphaël Doursenaud
0d8641a073 [Qual] Use jQuery property instead of attribute to test and set checked 2015-05-12 14:51:30 +02:00
Laurent Destailleur
83e4fe5d95 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/fourn/facture/list.php
 2015-05-12 00:09:03 +02:00
Laurent Destailleur
8b596d7a69 Fix css missing 2015-05-10 23:43:18 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
jfefe
7e0357dcf9 FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Marcos García de La Fuente
7be7a770c1 Implemented units for CommandeFournisseur and FactureFournisseur 2015-04-19 16:46:24 +02:00
Florian HENRY
41631ceed9 typo 2015-04-18 23:43:11 +02:00
Florian HENRY
f2018b7946 fix bug #2652 2015-04-18 22:59:20 +02:00
Florian HENRY
b7191a541c All send email card works with model choice box 2015-04-18 17:15:36 +02:00
Marcos García de La Fuente
d6a2d972a6 Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL 2015-04-18 15:07:19 +02:00
Marcos García de La Fuente
9fee7a9827 Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL 2015-04-18 10:30:58 +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
dbaaa44c76 Fix: link must not be visible if module disabled 2015-04-13 13:22:12 +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
d76c1a9f42 Can filter on serial number into movement list 2015-04-10 12:59:33 +02:00
Laurent Destailleur
787083028b Fix: entered data are not lsot when error 2015-04-10 12:10:05 +02:00
Laurent Destailleur
530650b857 Make module productbatch stable 2015-04-10 11:59:41 +02:00
Laurent Destailleur
e01e0faeef Can reopen to edit supplier order once ordered 2015-04-09 16:15:52 +02:00
Laurent Destailleur
ed6f2e9386 Fix error management 2015-04-09 15:14:50 +02:00
Laurent Destailleur
fc803e7000 Fix permission lost when enabled/disabled module. 2015-04-08 17:33:38 +02:00
Laurent Destailleur
b3355df3bf Fix delivery delay could not be set to unknown 2015-04-08 13:00:03 +02:00
Laurent Destailleur
94087f539f Fix style 2015-04-08 11:50:40 +02:00
Laurent Destailleur
f38bf5a7d2 Fix extrafields were not saved when creating a supplier order 
Fix removed hooks where we must use trigger
 2015-04-03 11:00:52 +02:00
Laurent Destailleur
d71a3c52b4 Comments 2015-04-03 00:28:35 +02:00
Laurent Destailleur
e480177d9c Fix error of triggers not reported to user 2015-04-02 18:44:02 +02:00
Laurent Destailleur
cf0f458a51 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/en_GB/bills.lang
	htdocs/langs/en_GB/main.lang
	htdocs/langs/en_GB/orders.lang
	htdocs/langs/es_AR/bills.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/main.lang
	htdocs/langs/es_ES/bills.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/nb_NO/bills.lang
	htdocs/langs/pl_PL/bills.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/products.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/projects.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/vi_VN/bills.lang
 2015-04-02 13:57:20 +02:00
Laurent Destailleur
d8db32a99c NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
 2015-04-01 21:00:51 +02:00
Francis Appels
bba8b206a1 FIX: dispatch batch products 
Fix dispatching batch products and add error message.
Make DispatchProduct method backwards comp and add missing $trigger.
Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.
 2015-03-31 15:48:08 +02:00
Laurent Destailleur
2d50cc92b9 Differentiate title for customer and supplier orders/invoices. 2015-03-31 11:32:47 +02:00
Laurent Destailleur
73b2e0bd01 Merge pull request #2471 from marcosgdf/refactor 
refactor
 2015-03-29 16:17:36 +02:00
Laurent Destailleur
6f22243104 Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE 2015-03-23 15:25:21 +01:00
Laurent Destailleur
1a59b7b447 Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE 2015-03-23 15:23:44 +01:00
Laurent Destailleur
3844d4e6f7 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	htdocs/core/boxes/box_activity.php
	htdocs/fourn/commande/card.php
	htdocs/user/card.php
 2015-03-23 15:16:37 +01:00
Laurent Destailleur
dc0d3504dd Fix: Bad notification key 2015-03-23 14:52:47 +01:00
Laurent Destailleur
b9c3c074b1 Fix: a line was inserted when making update 
Fix: missing message into notification admin page
 2015-03-23 14:43:19 +01:00
Marcos García de La Fuente
4349f27299 Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
Laurent Destailleur
2d90256640 Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04 Merge pull request #2456 from marcosgdf/refactor-1 
Refactor 1
 2015-03-22 12:47:05 +01:00
Laurent Destailleur
a55af4387b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php
 2015-03-22 12:10:39 +01:00
Laurent Destailleur
d442ac328c Fix: some replacement tags were missing 2015-03-19 12:34:03 +01:00
Laurent Destailleur
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of 
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
 2015-03-18 21:44:57 +01:00
Laurent Destailleur
cd2fc2f890 Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook 
development rules. They are "addreplace" hooks, so you must return
content with"->resprints='mycontent'" and not with "return 'mycontent'"
 2015-03-18 14:31:37 +01:00
Marcos García de La Fuente
086e439543 Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
 2015-03-15 18:16:55 +01:00