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

40771 Commits

Author SHA1 Message Date
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Maxime Kohlhaas
098f2ab0b1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-18 23:09:24 +02:00
Maxime Kohlhaas
bcf9e7fb37 Fix : use getentity for stock sharing 2015-04-18 23:08:21 +02:00
Laurent Destailleur
5c80d46b74 Merge pull request #2663 from FHenry/develop 
fix bug #2652
 2015-04-18 23:06:19 +02:00
Florian HENRY
11e1d0310c typo 2015-04-18 23:00:22 +02:00
Florian HENRY
f2018b7946 fix bug #2652 2015-04-18 22:59:20 +02:00
Juanjo Menent
065711df3b Merge pull request #2662 from marcosgdf/fk_soc 
Fixed problem with u.fk_soc in PR #2654
 2015-04-18 22:52:29 +02:00
Marcos García de La Fuente
2a8cf5f8be Fixed problem with last PR #2654 2015-04-18 22:50:40 +02:00
Laurent Destailleur
70de42f576 Merge pull request #2658 from bafbes/develop 
Register contributor information for last pull request
 2015-04-18 22:23:59 +02:00
Laurent Destailleur
80e1ca73fb Merge pull request #2659 from FHenry/develop 
fix : #2640
 2015-04-18 22:23:28 +02:00
Marcos García de La Fuente
a8f60a5c18 Revert "Sanitize for security." 
This reverts commit 1598a5d3a6.
 2015-04-18 22:11:11 +02:00
Florian HENRY
92494cd1ec fix : #2640 2015-04-18 22:09:19 +02:00
bafbes
f4fe71a7fe Update filefunc.inc.php 2015-04-18 20:59:00 +01:00
Laurent Destailleur
ed6abb0f79 Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2576 
Conflicts:
	ChangeLog
 2015-04-18 20:56:27 +02:00
Laurent Destailleur
25a996644d Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into develop 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:52:02 +02:00
Marcos García de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Laurent Destailleur
9dd73de9b0 Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:47:20 +02:00
Laurent Destailleur
1598a5d3a6 Sanitize for security. 2015-04-18 20:43:52 +02:00
Marcos García de La Fuente
c07e26dcac Merge branch 'develop' into fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Laurent Destailleur
21a6fd1cb4 Merge pull request #2633 from bafbes/develop 
NEW : dev feature : replace conf filename with "conf" parameter on url b...
 2015-04-18 20:30:49 +02:00
Laurent Destailleur
8be83cd043 Merge branch 'develop' of https://github.com/fappels/dolibarr into fappels-develop 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-04-18 20:29:25 +02:00
Laurent Destailleur
b3fc8d2940 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2015-04-18 20:27:50 +02:00
Laurent Destailleur
fcbb4a5328 Merge branch 'langtool' of https://github.com/Diciannove/dolibarr into Diciannove-langtool 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/en_US/orders.lang
	htdocs/langs/en_US/stocks.lang
 2015-04-18 20:26:23 +02:00
Laurent Destailleur
f7b2b00ebd Merge pull request #2650 from FHenry/dev_pdfpropalmergeproductpdf 
NEW : Propal merge PDF product attached files (on option)
 2015-04-18 20:18:57 +02:00
Laurent Destailleur
b7cf0ded00 Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2577 
Conflicts:
	ChangeLog
 2015-04-18 20:12:27 +02:00
Maxime Kohlhaas
7b035d3b5f Fix : menu financial was not displayed when only supplier module is activated 2015-04-18 20:11:19 +02:00
Laurent Destailleur
9b69b64626 Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583 
Conflicts:
	ChangeLog
 2015-04-18 20:10:06 +02:00
Laurent Destailleur
cb0e45d54b Merge pull request #2647 from aternatik/fix_css 
Fix : css properties for lists and input fields
 2015-04-18 20:05:10 +02:00
Laurent Destailleur
6e136616c6 Merge pull request #2649 from atm-maxime/develop 
Alert when oustanding amount excedeed
 2015-04-18 20:04:25 +02:00
Maxime Kohlhaas
ecf1fbe5a7 Typo 2015-04-18 20:03:40 +02:00
jfefe
bee5af4d9e Fix : bad usage of empty function with GETPOST 2015-04-18 19:56:36 +02:00
Maxime Kohlhaas
c3bcda74f3 Fix : unit price without tax is now subprice (not pu_ht) 2015-04-18 19:17:05 +02:00
Florian HENRY
62ef9743ea Merge branch 'develop' into dev_pdfpropalmergeproductpdf 2015-04-18 19:16:33 +02:00
Juanjo Menent
c5d8fa4602 Fix: solves #2644 2015-04-18 19:14:30 +02:00
Maxime Kohlhaas
2ddef9ffd9 Alert when oustanding amount excedeed 2015-04-18 19:08:44 +02:00
Maxime Kohlhaas
53469c803a Typo 2015-04-18 19:08:01 +02:00
jfefe
4f0829d4ea Adjust CSS : missing color for input, textarea and select list 2015-04-18 19:01:33 +02:00
Laurent Destailleur
e4656ecfd4 Merge pull request #2636 from defrance69/patch-59 
NEW Add list of orders into commercial page
 2015-04-18 18:58:06 +02:00
jfefe
c5b191d590 Adjust CSS properties for tables 2015-04-18 18:57:13 +02:00
Francis Appels
c5599efe62 Don't show 'undifined' when no max delivery time 2015-04-18 18:56:25 +02:00
Laurent Destailleur
4201cf9f7f Merge pull request #2638 from atm-maxime/fix_cust_outstanding 
Fix cust outstanding
 2015-04-18 18:56:23 +02:00
Francis Appels
308ee40134 Fix Lang part2 
Fix lang in en_us
 2015-04-18 18:53:25 +02:00
Laurent Destailleur
07bf403354 Merge pull request #2645 from atm-maxime/develop 
Fix : outstanding limit was not saved
 2015-04-18 18:49:53 +02:00
Maxime Kohlhaas
8e4771daa0 Fix : outstanding limit was not saved 2015-04-18 18:48:50 +02:00
Laurent Destailleur
e1403b136c Merge pull request #2639 from aternatik/stable_resource 
New : mark resource module as stable
 2015-04-18 18:48:24 +02:00
Florian HENRY
e15d4c045d NEW : Propal merge product card PDF into azur 2015-04-18 18:44:05 +02:00
philippe grand
838329f3d9 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-04-18 18:36:00 +02:00
Maxime Kohlhaas
51522decf3 Fix : price in editkeyval function was forcing a price rounding 2015-04-18 18:33:46 +02:00
jfefe
5c4633d538 New : mark resource module as stable 2015-04-18 18:18:21 +02:00
Laurent Destailleur
08dfcf3afc Merge 2015-04-18 18:14:55 +02:00
jfefe
f2e19f2326 Fix: error when deleting resource 2015-04-18 18:07:59 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Laurent Destailleur
ca05c9a26f Fix PHPCS 2015-04-18 18:07:36 +02:00
Maxime Kohlhaas
8b307aac56 Fix : customer outstanding was not calculated properly 2015-04-18 18:06:27 +02:00
Maxime Kohlhaas
e0af2feced Fix : on impayees remain to pay did not include deposits 2015-04-18 18:06:02 +02:00
faust
4bb83de146 en_US: fix lang 2015-04-18 18:03:40 +02:00
BENKE Charlie
c9aaf51627 Update index.php 
add last orders in commercial index page
 2015-04-18 17:49:48 +02:00
Laurent Destailleur
873899a5d4 Merge pull request #2635 from FHenry/develop 
fix typo
 2015-04-18 17:45:25 +02:00
Laurent Destailleur
e7505e49cf Merge pull request #2623 from GPCsolutions/pear_mail_mime 
Update PEAR Mail_MIME to 1.8.9
 2015-04-18 17:44:30 +02:00
Laurent Destailleur
471a5857d2 Fix CSS 2015-04-18 17:42:24 +02:00
Florian HENRY
bbed849911 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 17:37:49 +02:00
Florian HENRY
b7191a541c All send email card works with model choice box 2015-04-18 17:15:36 +02:00
Laurent Destailleur
69b9de08b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 16:54:20 +02:00
Laurent Destailleur
ce81f58986 Fix several bugs into edit of supplier lines 2015-04-18 16:54:00 +02:00
Florian HENRY
cc887ceff3 fix typo 2015-04-18 16:45:45 +02:00
faust
b7fb3d7d9e en_US: 'opened' is not an adjective... 2015-04-18 16:39:57 +02:00
jean
8006edc278 correct issue 2589 getting user signature in script, when user is sended 
through a script parameter
 2015-04-18 16:39:53 +02:00
bafbes
4c8dc1ba5b NEW : dev feature : replace conf filename with "conf" parameter on url by GET 2015-04-18 15:26:33 +01:00
faust
fb57cced55 en_US: fix typos and errors 2015-04-18 16:04:48 +02:00
faust
9a3b5305fe fix duplicate lines 2015-04-18 15:35:19 +02:00
Laurent Destailleur
a5ba7c664e Merge pull request #2627 from FHenry/develop 
NEW : Email template choose on thirdparty card
 2015-04-18 15:24:46 +02:00
Laurent Destailleur
8cd22ae6c8 Merge pull request #2631 from fappels/develop 
FIX lang
 2015-04-18 15:11:50 +02:00
Laurent Destailleur
7c8bb14fe4 Merge pull request #2628 from marcosgdf/bug-2579 
Fix Bug #2579: Bad display duration enter data on intervention
 2015-04-18 15:11:32 +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
Laurent Destailleur
246c8a01a6 Merge pull request #2611 from defrance69/patch-58 
Update paiement.class.php
 2015-04-18 15:05:16 +02:00
jfefe
fe01c4470d Show tools menu when activating resource module 2015-04-18 15:04:44 +02:00
Juanjo Menent
459737e171 Merge pull request #2625 from marcosgdf/bug-2601 
Fix bug #2601 Supplier orderstoinvoice does not work with PostgreSQL
 2015-04-18 15:03:01 +02:00
Marcos García de La Fuente
401c0584e5 Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php 2015-04-18 14:59:19 +02:00
Juanjo Menent
5203d5ead0 Merge pull request #2626 from marcosgdf/bug-2598 
Fix bug #2598 Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php
 2015-04-18 14:58:25 +02:00
Juanjo Menent
f8a1bf9a10 Merge pull request #2621 from atm-maxime/develop 
Remove debug trace
 2015-04-18 14:49:23 +02:00
Juanjo Menent
2f8ed32f76 Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 14:17:00 +02:00
Juanjo Menent
d3f24dab0a Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 13:36:47 +02:00
Florian HENRY
d3592c8d58 typo 2015-04-18 13:09:35 +02:00
Francis Appels
d6fc0aa7b5 FIX lang 2015-04-18 11:42:38 +02:00
Juanjo Menent
dc74302985 Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 11:32:01 +02:00
Marcos García de La Fuente
de494b2904 Fix Bug #2579: Bad display duration enter data on intervention 2015-04-18 11:25:15 +02:00
Maxime Kohlhaas
2b8efc302a Fix : shipment model selection 2015-04-18 11:24:55 +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
Marcos García de La Fuente
b5ed65f838 Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php 2015-04-18 10:50:07 +02:00
Maxime Kohlhaas
1fa43379c9 Merge branch 'develop' of github.com:atm-maxime/dolibarr into develop 2015-04-18 10:43:11 +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
Maxime Kohlhaas
7aba52c810 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-18 10:29:43 +02:00
Raphaël Doursenaud
e8332cc724 Update PEAR Mail_MIME to 1.8.9 
This is nusoap dependency and the unkown previous version
was GPL incompatible and used deprecated functions.
 2015-04-18 04:27:15 +02:00
Maxime Kohlhaas
7223495ac2 Fix : date_delivery was not a datetime 2015-04-18 04:21:16 +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
07fd6a3ae7 Fix : delivery date was not a datetime 2015-04-18 04:18:40 +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
Laurent Destailleur
6de4292ccf Merge pull request #2619 from atm-maxime/develop 
NEW shipment lists by status
 2015-04-18 03:51:11 +02:00
Laurent Destailleur
f17a6cbe7e Merge branch 'develop' of https://github.com/novalore/dolibarr into 
novalore-develop

Conflicts:
	htdocs/langs/en_US/trips.lang
 2015-04-18 03:37:18 +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
d94564ab93 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-18 01:11:28 +02:00
Maxime Kohlhaas
1ad610130a Fix : shipment list sql request and delivery display 2015-04-18 01:09:16 +02:00
faust
c21961c4d8 word order in workflow.lang 2015-04-18 00:50:32 +02:00
faust
066e05a8ef another typo 2015-04-18 00:21:25 +02:00
Laurent Destailleur
5617399974 Removed deprecatd lines 2015-04-18 00:13:12 +02:00
faust
a54dd15afb fixed typos in trips.lang 2015-04-18 00:04:09 +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
Laurent Destailleur
78e6aacda2 Fix format not supported by js lib 2015-04-17 13:22:36 +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
9a604fa0bc Fix grammar 2015-04-15 17:55:59 +02:00
BENKE Charlie
6eb17a79da Update paiement.class.php 
standardisation of the call of fetch by adding the $ref even they not realy used
 2015-04-15 11:40:12 +02:00
Laurent Destailleur
0c1ea1c7f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-14 20:10:27 +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
Laurent Destailleur
95029516db Field note was renamed. 2015-04-14 19:46:49 +02:00
Raphaël Doursenaud
54b8aa8a0b Fixed typo in task export 
Closes #2607, #2609
 2015-04-14 19:14:16 +02:00
Frédéric FRANCE
cce0ff83b9 Add VAT for Senegal 2015-04-14 16:33:56 +02:00
Laurent Destailleur
c668b82fd5 Fix translation 2015-04-14 14:23:26 +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
Laurent Destailleur
f323e89919 Add hidden option PROJECT_LIST_SHOW_STARTDATE to show start date of 
project.
Increase visible length of fields.
 2015-04-14 12:21:23 +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
39e4f52497 Fix: all amount must be without tax 2015-04-13 19:11:23 +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
dbaaa44c76 Fix: link must not be visible if module disabled 2015-04-13 13:22:12 +02:00
Laurent Destailleur
c228302039 minor fix 2015-04-13 13:14: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
0e7f4db0bb Move translation key 2015-04-13 09:59:38 +02:00
Laurent Destailleur
0e81dc7c6c Add missing langs 2015-04-13 09:24:39 +02:00
Laurent Destailleur
4aef43c14b Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-13 01:33:38 +02:00
Laurent Destailleur
584ca971b0 Fix #2600 2015-04-13 01:32:53 +02:00
Laurent Destailleur
c0ddfbfab7 Merge pull request #2597 from marcosgdf/bug-1906 
Fixes for bugs #1906 and #1905
 2015-04-13 01:04:23 +02:00
Marcos García de La Fuente
8f0c41dbd2 Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card 2015-04-12 22:02:25 +02:00
Marcos García de La Fuente
6173706531 Fix: [ bug #1906 ] Deplacement does not allow translated decimal format 2015-04-12 21:55:20 +02:00
Marcos García de La Fuente
9cfb295675 Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref 2015-04-12 21:05:26 +02:00
Marcos García de La Fuente
bbd01c0c8d Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project 2015-04-12 20:59:58 +02:00
Marcos García de La Fuente
728b64e334 Fix Bug #2583: Unable to create a bank transfer with localized numbers 2015-04-12 20:24:22 +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
93bb9549c9 Merge pull request #2586 from frederic34/patch-7 
Update loan card
 2015-04-12 19:21:57 +02:00
Laurent Destailleur
193c080744 PHPCS 2015-04-12 19:20:48 +02:00
Laurent Destailleur
744b0b0e45 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-12 17:08:33 +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
6502d1c269 Fix: filter on stock too low forgot some lines 2015-04-12 15:22:34 +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
1bf95b48c1 Fix remove warning when posting a vote 2015-04-12 11:45:50 +02:00
Laurent Destailleur
d5afff4388 Fix warnings when submitting a vote for a survey 2015-04-12 11:42:49 +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
Frédéric FRANCE
cc40f58aa1 Update loan card 2015-04-10 18:26: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
15531a7ebc Better title for some boxes 2015-04-10 11:50:57 +02:00
Laurent Destailleur
d944c3bf17 Code cleaner when we are using multicompany 2015-04-10 11:40:24 +02:00
Laurent Destailleur
c25872b182 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-10 10:21:10 +02:00
Laurent Destailleur
fb868bc8f9 We must use the dol_fiche_head and dol_fiche_end also for "create" 
forms.
 2015-04-10 10:20:51 +02:00
Laurent Destailleur
2b071a6091 NEW: For a contract line, price is no more mandatory. 2015-04-10 10:17:20 +02:00
aspangaro
1f5ca497d3 Bug: Untranslated table header in /compta/bank/search.php 2015-04-09 20:50:19 +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
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
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
275724e7d6 Merge remote-tracking branch 'origin/3.7' into develop 2015-04-08 21:36:30 +02:00
Laurent Destailleur
ddde869ca4 Sync transifex 2015-04-08 21:35:27 +02:00
Laurent Destailleur
c4daca2bac Fix #1682 2015-04-08 21:34:04 +02:00
Laurent Destailleur
e3bbbaf2e1 Comments 2015-04-08 20:52:18 +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
efb43a7015 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-08 20:40:19 +02:00
Laurent Destailleur
091420f8ae Close #2568 2015-04-08 20:40:01 +02:00
Laurent Destailleur
aaef3a41c0 Short label into table 2015-04-08 19:33:06 +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
b3355df3bf Fix delivery delay could not be set to unknown 2015-04-08 13:00:03 +02:00
Laurent Destailleur
1efa5bcabd Fix: Avoid duplicate tooltip 2015-04-08 12:44:11 +02:00
Laurent Destailleur
dd48942f1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-08 12:23:11 +02:00
Laurent Destailleur
17fa1ce5b6 Fix #2552 2015-04-08 12:22:52 +02:00
Laurent Destailleur
edd104a6bc Merge pull request #2563 from frederic34/patch-7 
Accounts "from" & "to" need to have same currency
 2015-04-08 11:51:41 +02:00
Laurent Destailleur
15ba6716f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-08 11:50:59 +02:00
Laurent Destailleur
94087f539f Fix style 2015-04-08 11:50:40 +02:00
Frédéric FRANCE
7f62892609 Display total with currency code 2015-04-08 09:19:41 +02:00
Frédéric FRANCE
856238c876 Accounts "from" & "to" need to have same currency 2015-04-08 09:09:11 +02:00
Laurent Destailleur
369d6915b8 Fix: PHPCS 2015-04-08 00:14:44 +02:00
Laurent Destailleur
bc69703888 Fix phpcs 2015-04-08 00:07:46 +02:00
Laurent Destailleur
f9c8b2e1cf Merge pull request #2560 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2015-04-07 23:56:40 +02:00
Laurent Destailleur
bb83eb0f68 Merge pull request #2561 from frederic34/patch-5 
Fix #2559 Bug: Untranslated "Total" in Bank module
 2015-04-07 23:50:17 +02:00
Juanjo Menent
1f4a131691 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/product/stock/product.php
 2015-04-07 20:43:27 +02:00
Juanjo Menent
d7ba9b3312 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/stock/mouvement.php
 2015-04-07 20:40:48 +02:00
Juanjo Menent
9d8cb459f1 Fix: Bad permission assignments for stock movements actions 2015-04-07 20:28:45 +02:00
Juanjo Menent
c2bc2c9ea6 Solves #2542 Bug: Contracts store localtax preferences 
Conflicts:
	htdocs/compta/facture.php
 2015-04-07 20:10:27 +02:00
Juanjo Menent
1ab70a7086 Solves #2542 Bug: Contracts store localtax preferences 
Conflicts:
	htdocs/compta/facture.php
 2015-04-07 20:05:56 +02:00
Juanjo Menent
35a6ed90a0 Solves #2542 Bug: Contracts store localtax preferences 2015-04-07 20:02:12 +02:00
Juanjo Menent
a0de33912e Closes #2545 Bug: Missing object_margin.png in Amarok theme 
Conflicts:
	ChangeLog
 2015-04-07 18:57:45 +02:00
Juanjo Menent
2dfaf08f61 Closes #2545 Bug: Missing object_margin.png in Amarok theme 
Conflicts:
	ChangeLog
 2015-04-07 18:54:38 +02:00
Juanjo Menent
345b609ff0 Closes #2545 Bug: Missing object_margin.png in Amarok theme 2015-04-07 18:41:40 +02:00
Frédéric FRANCE
06c749942a Update index.php 2015-04-07 18:40:19 +02:00
Laurent Destailleur
49e678b9c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-07 18:14:44 +02:00
Laurent Destailleur
547b7d5f91 Fix #2539 2015-04-07 18:14:20 +02:00
Frédéric FRANCE
0dc7bc0ddb Add badge 2015-04-07 12:54:10 +02:00
Frédéric FRANCE
7a2942684c Fix #2559 Bug: Untranslated "Total" in Bank module 2015-04-07 12:45:25 +02:00
Laurent Destailleur
6fa0234409 Uniformize code 2015-04-07 03:00:11 +02:00
Laurent Destailleur
ad50810c7a Fix deprecated code 2015-04-07 02:48:19 +02:00
Laurent Destailleur
c931576e0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-07 02:45:43 +02:00
Scrutinizer Auto-Fixer
918ed34364 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-07 00:45:30 +00:00
Laurent Destailleur
1d6a8a46f1 To clean an int we must use (int) and not trim() 2015-04-07 02:44:30 +02:00
Laurent Destailleur
c25af905a3 Merge pull request #2557 from frederic34/adherent 
Add public note to members
 2015-04-06 21:23:40 +02:00
Frédéric FRANCE
85d8d06ca4 Travis fix CMailFile.class.php 2015-04-06 20:02:29 +02:00
Laurent Destailleur
493392d89f Remove warnings 2015-04-06 19:46:10 +02:00
Laurent Destailleur
c148f82452 Fix warning 2015-04-06 19:31:25 +02:00
Laurent Destailleur
2550c6b0af Must exclude draft and abandon into default filter. 2015-04-06 19:22:58 +02:00
Laurent Destailleur
877e60c76f Set default filter 2015-04-06 19:20:11 +02:00
Laurent Destailleur
02e8879d3b NEW Feature to build a merged pdf with all unpaid invoice can work for 
paid invoices.
 2015-04-06 19:11:31 +02:00
frederic34
19b55cb4c1 Add public note to members 2015-04-06 18:58:36 +02:00
Laurent Destailleur
3d161deb17 Fix more robust function 2015-04-06 16:50:26 +02:00
Laurent Destailleur
b49705d5d0 Status and amount of object should always be visible. 2015-04-06 16:13:23 +02:00
Laurent Destailleur
683f27f6b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-06 14:11:52 +02:00
Laurent Destailleur
fa162cb327 Missing field 2015-04-06 14:11:28 +02:00
Laurent Destailleur
0155d75f27 Merge pull request #2554 from aspangaro/develop-adherent 
Module member: move field note to note_private & typo
 2015-04-06 12:58:52 +02:00
Laurent Destailleur
a42eb7b787 Merge branch 'bug-2535' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2535 
Conflicts:
	ChangeLog
 2015-04-06 12:52:33 +02:00
Laurent Destailleur
8ce66aad79 Merge branch 'bug-2534' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2534 
Conflicts:
	ChangeLog
 2015-04-06 12:48:55 +02:00
Laurent Destailleur
d8b50722f3 Merge pull request #2548 from marcosgdf/bug-2540 
Close #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty
 2015-04-06 12:41:38 +02:00
Laurent Destailleur
f9608bf41d Merge pull request #2547 from marcosgdf/bug-2543 
Closes #2543: Untranslated "Contract" origin string when creating an invoice from a contract
 2015-04-06 12:38:54 +02:00
Laurent Destailleur
e2508287bd Merge pull request #2537 from marcosgdf/cq 
Created Propal, FactureFourniseur, and Commande constants for status
 2015-04-06 12:37:52 +02:00
Scrutinizer Auto-Fixer
4da737424e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-06 10:25:30 +00:00
Laurent Destailleur
828dc2c9f4 Fix code standard 2015-04-06 12:22:52 +02:00
Laurent Destailleur
a5c74a7d95 Clean code 2015-04-06 11:59:58 +02:00
Laurent Destailleur
2627662f5c fix value ust be a string 2015-04-06 11:36:31 +02:00
Laurent Destailleur
8fb14b122a Fix phpcs 2015-04-06 11:28:06 +02:00
aspangaro
03b1db138e Debug 2015-04-06 08:20:23 +02:00
aspangaro
ca82c2f36d Merge remote-tracking branch 'Upstream/develop' into develop-adherent 2015-04-06 07:53:04 +02:00
Laurent Destailleur
5fa21f37f0 Fix trim label 2015-04-05 17:13:24 +02:00