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

890 Commits

Author SHA1 Message Date
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Raphaël Doursenaud
6d7728d9bf Regenerate document on supplier orders steps 2014-04-02 15:37:19 +02:00
Laurent Destailleur
9a8a306d78 Qual: Method form->select_currency() has been removed. Use instead 
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
 2014-04-02 14:53:42 +02:00
Laurent Destailleur
3a2caa6e64 New: Can filter on status for supplier order. 2014-04-02 12:48:34 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Alexis Algoud
f97c8feb54 fix can't add line with product in supplier order 2014-03-26 11:28:41 +01:00
Florian Henry
cf9b194008 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-21 15:08:30 +01:00
Florian Henry
f0882eca2d Add ref supplier as column and clear varialbes in double 2014-03-21 15:01:40 +01:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00
Gauthier
eb43bc4982 Correction when adding line with price as '0' 2014-03-17 15:38:12 +01:00
Laurent Destailleur
b1498c584d Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into 
KreizIT-dluo_step5

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-16 20:49:56 +01:00
KreizIT
9be2bb0e60 Travis Fix 2014-03-16 07:00:27 +01:00
KreizIT
3782742aad - add batch management on supplier dispatch product 
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
 2014-03-15 10:28:01 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
ea773531b5 Fix: [ bug #1206 ] PMP price is bad calculated 2014-03-01 14:49:30 +01:00
Laurent Destailleur
b64a2b2718 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-28 21:43:29 +01:00
Laurent Destailleur
74404749c6 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 2014-02-28 16:00:57 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
geoffrey.girard
efa7a16c07 Add hook printObjectLine supplier order and supplier invoice 2014-02-04 17:30:48 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
Laurent Destailleur
9e5e74cb58 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/fourn/commande/fiche.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
 2013-12-19 21:03:15 +01:00
Geoffrey
1942b4a476 add extrafields support in supplier orders. managed in configuration but not in view mode 2013-12-17 16:15:48 +01:00
Geoffrey
dce354adc3 add extrafields support in supplier orders. managed in configuration but not in view mode 2013-12-16 11:13:39 +01:00
Laurent Destailleur
a05d9b864a Fix: Test must never be done on a translated string 2013-12-08 16:40:45 +01:00
Laurent Destailleur
37b0780523 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/ecm/tpl/builddatabase.tpl.php
	htdocs/fourn/commande/liste.php
	htdocs/product/admin/product_tools.php
 2013-12-08 00:42:36 +01:00
Laurent Destailleur
395066519b Fix: [ bug #1163 ] SQL Error when searching for supplier orders 2013-12-01 16:18:18 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +01:00
simnandez
b9c8852471 Qual: Improve suppliers orders manual receivings 2013-11-14 17:08:59 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1 factorization 2013-11-06 10:20:54 +01:00
Cédric Salvador
23008c3b31 factorized document actions 
Conflicts:
	htdocs/societe/document.php
 2013-11-06 10:11:40 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Grand Philippe
c5f29e14a4 missing trad and fix language 2013-11-02 17:50:24 +01:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Raphaël Doursenaud
e762042828 Fixed typos 2013-09-05 18:06:51 +02:00
Florian Henry
3cf3dbeb51 Add pdf link into supplier invoice list and supplier order list 2013-08-09 13:48:44 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Maxime Kohlhaas
5a38a43c87 Task # 1011 : now supplier order and invoice deal with payment terms and mode 2013-07-30 16:21:39 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Florian Henry
e82b8e9b9e Fix [ bug #990 ] Filter + sort does not work on order list 2013-07-26 12:16:39 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
548ea4f93f Fix: Navigation 2013-07-10 23:58:49 +02:00
Laurent Destailleur
c98545010b Fix: Navigation 2013-07-10 23:57:18 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Marcos García
3b28de0a07 Fixed some translation problems 2013-06-08 21:57:57 +02:00
Cédric Salvador
37ef86379f fixed bug when editing a supplier order line 2013-06-05 18:19:50 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Marcos García
5b248805c2 Notifications popup messages were not showing real notifications that were going to be sent 2013-04-21 14:24:19 +02:00
Raphaël Doursenaud
e1a3d46ea0 Fixed for new API for note update 2013-04-20 06:43:13 +02:00
Laurent Destailleur
d3f29649d5 Fix into div/br 2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
e0baa0fe46 Generalize fix: file with a specific mask not found, again 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/expedition/fiche.php
	htdocs/fichinter/fiche.php
 2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba Generalize fix: file with a specific mask not found, again 2013-03-30 13:54:46 +01:00
Maxime Kohlhaas
83def2cd57 Fix : on a new trigger, using $this but not in a class... 2013-03-25 18:03:42 +01:00
Laurent Destailleur
4e029bf2ca Fix: Security does not need special case 2013-03-24 21:06:45 +01:00
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00
simnandez
8114249fca [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Supplier order
 2013-03-12 15:06:38 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
51d23d7c48 Merge fix of 3.3 2013-03-02 16:17:12 +01:00
Laurent Destailleur
81a06507fa Fix: data not refreshed 2013-03-02 16:01:46 +01:00
Maxime Kohlhaas
cd5bda27f4 Supplier dispatch : add new trigger called after order is dispatched 2013-02-25 16:56:37 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Laurent Destailleur
3eb485d521 Qual: Removed TODO, deprecated code and deprecated properties. This also 
fix missing combo box of contacts onto CC.
 2013-02-12 17:08:21 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Regis Houssin
9868880142 Fix: missing files library 2013-01-23 11:29:58 +01:00
Regis Houssin
c66c02e745 Fix: missing files library 2013-01-23 11:28:11 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
Laurent Destailleur
5f99488c99 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/langs/es_ES/admin.lang
 2013-01-05 16:41:08 +01:00
simnandez
c639d80372 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:47:54 +01:00
simnandez
32b19802b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:43:40 +01:00
Laurent Destailleur
4fe1ba33f9 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
 2012-12-30 18:00:07 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Marcos García
0c113d33a6 Removed unuseful code 
Some lines may be marked as changed but they are not because of incorrect line endings
 2012-12-29 13:12:45 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Laurent Destailleur
4abae05c26 Qual: Uniformize behaviour of product selection 2012-11-26 13:37:40 +01:00
Laurent Destailleur
80c252dd62 Fix: Use same labels to go back to draft than other elements. 
Re-open is for "closed" to a validated status.
Modify is for a validated status to draft.
 2012-11-03 21:33:55 +01:00
Regis Houssin
d0dc336a85 New: jQuery and jQuery UI upgrade 
New: jQuery Timepicker addon for Datepicker
 2012-11-03 19:15:45 +01:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +02:00
Regis Houssin
446a81b4c4 Fix: move class in template 2012-10-18 10:35:55 +02:00
Laurent Destailleur
8ff506b120 Sec: Sanitize all params page, sortfield and sortorder 2012-10-13 14:47:46 +02:00
Maxime Kohlhaas
ed2a140046 Task # 559 : add display of discount in product list while adding line on supplier order 2012-10-01 11:45:28 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have 
it.
 2012-09-09 13:13:24 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Regis Houssin
6fe631378b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-25 11:28:08 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Marcos García
082753d115 Refactored code 2012-08-24 19:55:31 +02:00
Marcos García
977571e032 Forgot to apply the patch to the rest of the files 2012-08-24 18:32:19 +02:00
Marcos García
0ecfe0465e Fixed bug #499 
The input method of supplier orders wasn't being translated
 2012-08-23 09:20:30 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
577a853b9b New: update field "qty" with minimum qty for this supplier price 2012-08-17 18:17:15 +02:00
Regis Houssin
7394525388 Fix: disable "add" button and show error message if a product with no 
supplier price is selected
 2012-08-17 16:58:57 +02:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no 
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
 2012-08-17 15:16:07 +02:00
Regis Houssin
4825448ced Merge pull request #315 from marcosgdf/error-messages 
Forgot to migrate to some lines to the new error-handler
 2012-08-16 13:59:05 -07:00
Marcos García
29f2e7236a Forgot to migrate to some lines to the new error-handler 2012-08-16 21:37:33 +02:00
Regis Houssin
7a30416124 Merge pull request #310 from marcosgdf/error-messages 
Added missing error messages in supplier & customer's orders
 2012-08-16 08:16:56 -07:00
Marcos García
db5d046ee7 Applied 3.3 error management as @hregis requested 2012-08-16 13:10:14 +02:00
Marcos García
3941466cd3 Removed duplicated code 2012-08-16 03:55:41 +02:00
Marcos García
b4471a4bd7 Added missing error messages in supplier & customer's orders 2012-08-15 15:52:51 +02:00
Stephen L
c1d15a9572 Add: hooks and triggers for a lot of core modules (action/calendrier, deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, fournisseur commandes et factures, fiche intervention, projet et taches) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 15:50:45 +02:00
Laurent Destailleur
2f0a88ce69 [ bug #480 ] Can't receive to stock with strict mode 2012-08-07 19:32:51 +02:00
Regis Houssin
28851b46c4 Fix: remove duplicate code 2012-07-29 16:44:19 +02:00
Regis Houssin
a64723ea74 Fix: replace with new event message system 2012-07-29 16:11:52 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of 
message
 2012-07-29 08:26:33 +02:00
Regis Houssin
75588c2eb3 Merge pull request #272 from marcosgdf/backtolist-links 
Created BackToList links
 2012-07-28 13:15:42 -07:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Marcos García
90963ca84a BackToList links in Client orders section 2012-07-28 20:54:07 +02:00
Marcos García
472397d5c2 BackToList links in Supplier order section 2012-07-28 20:47:12 +02:00
Marcos García
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Regis Houssin
77b9718473 Fix: strict mode street 2012-07-13 10:15:47 +02:00
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
bf379fc242 Fix: uniformize code 2012-06-11 21:45:59 +02:00
Regis Houssin
274734b828 Fix: stock message in session and reload the page for avoid url problem 
with jQuery fileupload
 2012-05-31 21:11:26 +02:00
Laurent Destailleur
c2db3265ec Fix: Regression with quot management. Try a better fix. 2012-05-30 12:43:23 +02:00
Regis Houssin
a5b0de15ac Fix: can't delete a files with quote 2012-05-30 08:30:25 +02:00
Laurent Destailleur
3fc3292142 Fix: delete of documents is done by page of element, not by the view 
wrapper.
 2012-05-29 23:50:13 +02:00
Regis Houssin
516be43404 Fix: jquery fileupload broken feature 2012-05-25 20:56:05 +02:00
Regis Houssin
9cf2ea492c Fix: broken features with external module 2012-05-21 18:44:09 +02:00
juanjo
a6b0242f8a [ task #407 ] Manage PDF hidden items 2012-05-21 17:12:57 +02:00
simnandez
d226534ba0 Fix:[ bug #399 ] Bad calculation of local taxes in update line products 2012-05-09 12:12:14 +02:00
Laurent Destailleur
161846be77 Fix: [ bug #397 ] Product VAT is not coming from buying price 2012-05-08 22:10:07 +02:00
Laurent Destailleur
66531ea539 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/fourn/commande/index.php
 2012-04-16 12:03:33 +02:00
Regis Houssin
6c3e88e43a Fix: missing field change name 2012-04-16 11:52:27 +02:00
Laurent Destailleur
48542b8625 Fix: Must use tms date 2012-04-16 11:39:26 +02:00
Grand Philippe
980fa86857 uniformise code and fix rights 2012-04-13 14:02:53 +02:00
Grand Philippe
c8dd3b4801 to add delivery date 2012-04-10 17:21:28 +02:00
Laurent Destailleur
4e65d12a0f Fix: The draft view must be at same place for all pages. We will have to 
discuss to move all or not later.
 2012-04-04 17:43:32 +02:00
Vinicius Nogueira
4110f250a7 New: Box Status and Box Drafts changed position 
Show all Status and give the possibility to filter only one, and Drafts
position of the box changed to a better visualization
 2012-04-03 17:26:40 +08:00
Laurent Destailleur
daf2a19396 New: Add signature at end of predefined email text 2012-03-28 00:56:12 +02:00
Laurent Destailleur
78ae7dc075 Checkstyle 2012-03-27 09:59:28 +02:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01:00
Laurent Destailleur
0fd372e5da Trans: Update language files 
New: Prepare code to allow any module to change/add content of
predefined mail and signature.
 2012-03-22 23:52:02 +01:00
Regis Houssin
808c4b5732 New: testing a new method to avoid reloading the page 2012-03-18 14:06:55 +01:00
Regis Houssin
d752e25946 New: add new notes system in contract and order/invoice supplier module 2012-03-18 11:13:01 +01:00
Laurent Destailleur
a7a55645d8 Fix: Some fix when using fckeditor with notes. 
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
 2012-03-18 00:59:24 +01:00
Laurent Destailleur
245edb8596 Fix: Maxi debug on sending document by email. Works now with odt too. 2012-03-16 00:34:41 +01:00
Regis Houssin
8dc8297afe Fix: missing tva rates of supplier 2012-03-15 09:19:38 +01:00
Regis Houssin
f8bf7ade83 Fix: move method in common class 2012-03-13 20:01:10 +01:00
Regis Houssin
150f3ecfe3 Fix: move method in common class 2012-03-13 19:24:11 +01:00
Laurent Destailleur
b5fc41fadc Fix: Removed a lot of checkstyle warnings 2012-03-11 22:08:46 +01:00
FHenry
7b5c9de555 . 2012-03-08 05:15:15 +08:00
FHenry
aba929ed69 hook parameters on select product 2012-03-08 05:15:01 +08:00
Regis Houssin
9301def08d Fix: rename method 2012-03-02 15:03:14 +01:00
Regis Houssin
addc8db9e7 Fix: rename hooks 2012-03-01 16:51:59 +01:00
FHenry
16408b6310 Merge remote branch 'origin/develop' into develop 2012-02-29 14:32:33 +01:00
FHenry
59f424bde3 add hook for select produit 2012-02-29 14:32:22 +01:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Laurent Destailleur
24422afe44 Better fix 2012-02-26 02:54:16 +01:00
Laurent Destailleur
de187ab398 Try a better fix 2012-02-25 16:14:41 +01:00
Regis Houssin
19f53e6caa Fix: default customer language problem 2012-02-25 11:10:38 +01:00
Laurent Destailleur
c4b845d60a Qual: Removed deprecated function name. 2012-02-19 18:34:22 +01:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Laurent Destailleur
be4d04ebcc Fix: Default language set to language of thirdparty 2012-02-01 21:04:49 +01:00
Regis Houssin
c6e4206907 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-01 11:33:11 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +01:00
Laurent Destailleur
f3a966a313 Fix: Missing name 2012-01-29 23:24:47 +01:00
Laurent Destailleur
08e33f20dc Qual: Uniformize code 
Doxygen
 2012-01-19 09:53:27 +01:00
Regis Houssin
4eb88be3b6 Fix: bad rights 2012-01-09 11:28:37 +01:00
Regis Houssin
85d7285519 [bug #275] Ajout contacts - choix par "par défaut" de l'entreprise du 
fournisseur
Fix: uniform code
 2012-01-09 11:12:07 +01:00
Laurent Destailleur
c2348ef600 Uniformize field country_id, country_code, country 2011-12-29 18:07:41 +01:00
Laurent Destailleur
43964552bf Add a TODO 2011-12-22 09:07:02 +01:00
Laurent Destailleur
95a292f41b Fix: Update licence files 2011-12-17 21:58:44 +01:00
Laurent Destailleur
11727d68b8 Fix: update was not included into pdf generation 2011-12-02 19:57:20 +01:00
Laurent Destailleur
1c65768286 Fix: flot graph works with new json_encode 2011-12-01 22:58:32 +01:00
Laurent Destailleur
839781dfbe Qual: Removed a TODO by renaming all ->monnaie into ->currency 2011-11-23 14:55:36 +01:00
Laurent Destailleur
c50f3c5851 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-22 09:41:46 +01:00
Regis Houssin
065d7996f5 Fix: better with json_encode 2011-11-20 15:25:08 +01:00
Laurent Destailleur
c0774485f9 Qual: Uniformize code 2011-11-20 12:55:28 +01:00
Juanjo Menent
d7fce41b8a Fix: [bug 235] Bad local tax control 
Conflicts:
	htdocs/fourn/commande/fiche.php
 2011-11-20 10:17:14 +01:00
Laurent Destailleur
10961fb2c9 New: Can choose warehouse for stock change on supplier approbation or 
supplier invoice validation
 2011-11-09 22:10:58 +01:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Laurent Destailleur
40da2e23d2 Qual: Reduce sub-options of module fckeditor. This make code cleaner 
and all this duplicated options were useless.
 2011-11-05 23:18:49 +01:00
Juanjo Menent
5c9ba8a548 [task 189] Move Error* key from other.lang into errors.lang files 2011-10-29 23:52:05 +02:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
c65238b773 [task #216] Move lib in core directory 2011-10-24 10:45:06 +02:00
Regis Houssin
30c5f4b214 Move all core class in htdocs/core/class 2011-10-24 09:29:17 +02:00
Laurent Destailleur
15db353eb4 New: Add option MAIN_DISABLE_PDF_AUTOUPDATE 2011-10-14 16:44:22 +02:00
Laurent Destailleur
9e09b16219 Qual: Uniformize code 2011-09-24 23:42:31 +00:00
Laurent Destailleur
8aa6382206 Add hidden option PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS 2011-09-24 21:55:18 +00:00
Regis Houssin
6c4acefd93 Fix: Space before opening parenthesis of function call prohibited 2011-09-20 12:56:06 +00:00
Regis Houssin
b6a2f13673 Fix: avoid jenkins warning 
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
 2011-09-20 09:40:27 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Laurent Destailleur
2bb5e4ba69 Fix: W3C 2011-08-31 15:12:09 +00:00
Regis Houssin
03711cf6f2 Fix: remove obsolete tags 2011-08-27 19:15:14 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Regis Houssin
5085638f5e Fix: uniformize code 2011-08-23 18:40:45 +00:00
Laurent Destailleur
cfe34139cf Qual: Clean and uniformize code. 
Remove properties, that are not related to business, from parent business class commonobject.
 2011-08-22 22:04:21 +00:00
Laurent Destailleur
fe27643152 New: task #11243: Add best supplier price 2011-08-20 23:56:03 +00:00
Laurent Destailleur
e9b113ade8 Qual: Mutualize some code 
Fix: Missing begin
Fix: Removed functions returning database cursor
 2011-08-14 03:13:50 +00:00
Laurent Destailleur
3f2e6bbf82 Qual: Removed dead code 2011-08-14 02:11:15 +00:00
Laurent Destailleur
27ede66991 Fix: Use correct style for left tables 2011-08-08 15:28:00 +00:00
Laurent Destailleur
d246b87c1a Fix: removed print of function making print. 
Fix: default vat rate must be -1 to be automatic instead of deprecated conf->defaulttx
 2011-08-04 21:46:50 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Laurent Destailleur
f40efea008 Fix: file add and delte in email forms was broken with firefox 5 2011-07-10 20:03:38 +00:00
Laurent Destailleur
b76f055d2b Fix: Select of recipient on email form 2011-07-07 21:32:18 +00:00
Laurent Destailleur
e2b18d565a Fix: Bad order on documents pages 2011-07-06 20:56:48 +00:00
Laurent Destailleur
3b3f937e47 Fix: EMail sent message 2011-07-02 16:48:31 +00:00
Laurent Destailleur
7f852d293c Fix: Avoid wrap with chrome. 
Fix: Disable lightbox. Does not works with showphoto.
 2011-06-12 22:13:05 +00:00
Laurent Destailleur
8fe14361c3 Qual: Shorter legend 2011-06-07 00:08:06 +00:00
Laurent Destailleur
a3755324c0 New: Graph js librairie can accept percents with pie. 2011-06-06 22:23:24 +00:00
Regis Houssin
5f6ac1374c New: best method for linked object with actioncomm 
New: add action "shipping send by mail"
 2011-06-04 13:12:44 +00:00
Laurent Destailleur
edd91b7d26 Qual: Clean stock increase/decrease code 2011-05-23 23:46:39 +00:00
Laurent Destailleur
c6df144818 New: Add more graph and fix some statistics. 2011-05-22 00:42:37 +00:00
Laurent Destailleur
5a6221629e New: Add graph for orders. 2011-05-21 22:58:09 +00:00
Philippe Grand
1876606634 to use : hidedetails, hidedesc, hideref within supplier order 2011-05-19 14:58:26 +00:00
Regis Houssin
970a488f7c Fix: uniformize code 2011-05-09 09:44:06 +00:00
Regis Houssin
7416eeea9b Fix: problem with create 2011-05-09 07:42:16 +00:00
Regis Houssin
a052684a3a Fix: linked object block : mutualize code, more simple 
Fix: bad link
 2011-05-09 07:15:17 +00:00
Regis Houssin
67fe35e67b Fix: mutualize code, more simple 2011-05-06 18:27:18 +00:00
Philippe Grand
992fefebfb fix : Mode of payment within supplier order 2011-05-06 07:44:46 +00:00
Philippe Grand
6794eb3bbf prepair Mode of payment within supplier order 2011-05-05 21:35:07 +00:00
Philippe Grand
465a9b58e4 fix double paste 2011-05-05 10:26:51 +00:00
Philippe Grand
56feb1c32f include payment term within supplier order 2011-05-04 21:20:51 +00:00
Regis Houssin
827eed5d39 Fix: delete deprecated code 
Fix: change select_contact for view exclude contcat in grey mode
 2011-04-26 13:49:41 +00:00
Laurent Destailleur
e9f4879245 Qual: Prepare move of function dol_delete_file into file.lib.php 2011-03-09 15:34:57 +00:00
Laurent Destailleur
f2fe06a2b0 Fix: Link betwen supplier order and invoice 2011-03-08 00:15:32 +00:00
Laurent Destailleur
bee3592e59 Fix: Missing br 2011-03-08 00:03:03 +00:00
Laurent Destailleur
9ff348dfb5 Work on SMS features 2011-03-05 16:27:26 +00:00
Regis Houssin
aba9bb9acd Fix: compatibility with pgsql, replace all addslashes by $db->escape in other files 2011-02-24 18:22:24 +00:00
Laurent Destailleur
46808e5700 Reduce a step into supplier order workflow to save time (if user has permission to approve, order is approved when order is validated). 2011-02-23 14:44:29 +00:00
Laurent Destailleur
d8b0d279d8 Fix: Missing JUMP_TAG 2011-02-23 14:23:24 +00:00
Laurent Destailleur
638cb105df Fix: HTML tags must be escaped 2011-02-18 10:45:38 +00:00
Laurent Destailleur
7e1e28f0d8 Fix: Wrong order of name/firstname 2011-02-09 18:27:56 +00:00
Juanjo Menent
a97641eb1e Local Taxes: add funcionality for suppliers 2011-02-09 15:57:37 +00:00
Juanjo Menent
cd7f6ff6eb Local Taxes: add funcionality for suppliers 2011-02-09 13:07:34 +00:00
Juanjo Menent
e3317a7128 Local Taxes: add funcionality for suppliers 2011-02-08 22:45:30 +00:00
Regis Houssin
5da92bf9ae Fix: missing class 2011-02-08 11:00:59 +00:00
Regis Houssin
09f6fab2cc New: add width parameter in editor 2011-02-02 16:56:55 +00:00
Laurent Destailleur
11da59feea Fix: A parameter for urls must not contains any " 2011-01-14 02:02:57 +00:00
Laurent Destailleur
5bde360164 Fix: Sanitize filename 2011-01-14 01:24:00 +00:00
Laurent Destailleur
c8013ac699 Fix: Can't enable document for supplier invoice/order 2010-12-30 22:38:09 +00:00
Regis Houssin
e752ef828a Fix: uniformize code 2010-12-15 08:48:53 +00:00
Laurent Destailleur
2498426867 Fix: Restore stable version for 3.0 2010-12-14 23:27:17 +00:00
Regis Houssin
9d46536909 Fix: uniformize code 2010-12-14 15:04:56 +00:00
Laurent Destailleur
86ffc32195 Qual: Uniformize a lot of code (supplier_invoice => invoice_supplier, same for order) 
New: Add link between supplier invoices and supplier orders.
 2010-12-13 13:16:02 +00:00
Laurent Destailleur
cc93d642e0 Fix: Date was not always visible 2010-12-01 23:42:39 +00:00
Laurent Destailleur
dc3145e5dc Can create invoice from order only if order is "accepted" 2010-12-01 22:43:22 +00:00
Laurent Destailleur
6e75a3d203 Restore work lost by savannah backup 2010-12-01 21:16:28 +00:00
Laurent Destailleur
adfb9ea341 Sec: Removed security holes 2010-11-20 13:08:44 +00:00
Laurent Destailleur
8bc3bae49e New: Add suppliers orders to process in dashboard 2010-11-13 17:37:22 +00:00
Laurent Destailleur
46ad8917ad Perf: A little speed enhancement on document tabs. 2010-10-03 15:50:34 +00:00
Juanjo Menent
d793f8d250 task #8618: reverse improved supplier directory structure 2010-09-29 13:59:17 +00:00
Juanjo Menent
fc48d1888f task #8618: improved supplier directory structure 2010-09-28 16:24:25 +00:00
Regis Houssin
156a1e6b29 Qual: uniformize code 2010-09-10 14:35:07 +00:00
Regis Houssin
9664f0af5f Qual: big uniformize code 2010-09-09 14:06:15 +00:00
Laurent Destailleur
a81f5c9acf Fix: Uniformize code 2010-09-08 07:35:11 +00:00
Laurent Destailleur
83d473f0d7 Qual: Uniformize code 2010-09-04 17:18:13 +00:00
Laurent Destailleur
060d2df3ea Fix: Can send supplier order by mail at everystep after "approved". 2010-09-04 17:12:09 +00:00
Laurent Destailleur
2368cc676e Work on task #10579 : Simplify code using editor 2010-09-04 12:52:06 +00:00
Laurent Destailleur
7917c17844 Work on task #10579 : Simplify code using editor 2010-09-02 19:10:34 +00:00
Laurent Destailleur
c9cfb4c075 Fix: Show correct information 2010-08-26 22:31:30 +00:00
Laurent Destailleur
5b9398ed16 Fix: Show correct information 2010-08-26 22:28:04 +00:00
Laurent Destailleur
ba9757bd6f Fix: Wrong value 2010-08-26 15:58:26 +00:00
Laurent Destailleur
81c2b485c8 New: Can add a comment on stock dispatching to be saved into the stock movement. 2010-08-26 15:46:39 +00:00
Laurent Destailleur
76a7e8f424 Add more units 2010-08-26 14:49:40 +00:00
Laurent Destailleur
f038ba869b Trad 2010-08-26 13:17:42 +00:00
Philippe Grand
fb06c15330 task #6689, strlen problem 
replace  strlen with dol_strlen
 2010-08-24 14:42:18 +00:00
Regis Houssin
2c4a56771f Fix: $optiontype not used 
Fix: select_array is deprecated
 2010-08-19 15:20:25 +00:00
Regis Houssin
9601f8a353 Fix: $optiontype not used 
Fix: select_array is deprecated
 2010-08-19 15:13:17 +00:00
Laurent Destailleur
60edde845d Fix: Database compatibility 2010-08-09 15:52:44 +00:00
Laurent Destailleur
2db5b658f1 Fix: Some errors in vat management with multiprice 2010-07-22 21:16:29 +00:00
Laurent Destailleur
a8eec4910a Doxygen 2010-07-21 12:47:18 +00:00
Laurent Destailleur
29536ecbd8 Fix: Use correct order of firstname and lastname. 2010-07-18 10:39:07 +00:00
Laurent Destailleur
321840ee67 Fix: A lot of fix in permissions 2010-07-15 20:48:40 +00:00
Juanjo Menent
99e970d6c9 Local Taxes: Remove MAIN_FEATURES_LEVEL condition 2010-07-15 07:23:04 +00:00
Laurent Destailleur
1315833247 Minor fixes. 2010-07-11 19:29:18 +00:00
Laurent Destailleur
eb4ee0d42d Fix: Some fix in project referrers page. Add also third party in a column. 2010-06-28 21:26:36 +00:00
Laurent Destailleur
c0521a20a9 Qual: Remove deprecated code 2010-06-17 16:53:26 +00:00