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

44795 Commits

Author SHA1 Message Date
Laurent Destailleur
3b035819a9 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
	htdocs/product/document.php
	htdocs/societe/commerciaux.php
 2016-03-10 15:03:53 +01:00
Laurent Destailleur
d6f3a5c046 Fix bad path 2016-03-10 15:01:39 +01:00
Laurent Destailleur
d663b28dac Fix no database structure change is allowed into minor versions 2016-03-10 13:49:13 +01:00
Laurent Destailleur
f742d4ec66 Fix code corrupting database 2016-03-10 13:46:52 +01:00
Laurent Destailleur
80805f78ea Disable too dangerous patch. Fix must be done by doing an insert only 
without creating/renaming databases.
 2016-03-10 13:43:09 +01:00
Laurent Destailleur
9463b26476 Merge pull request #4774 from marcosgdf/bug-multiprice 
Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation
 2016-03-10 13:35:27 +01:00
Laurent Destailleur
45ab31815b Merge pull request #4767 from grandoc/3.9 
fix : missing translation
 2016-03-10 13:34:09 +01:00
Laurent Destailleur
a61882d847 Sync transifex 2016-03-10 12:44:05 +01:00
Florian HENRY
b58e155a6f FIX : #4785 2016-03-10 12:22:49 +01:00
philippe grand
6aa10a84df Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-10 09:01:11 +01:00
Laurent Destailleur
c907ca85c9 Fix css 2016-03-08 20:32:41 +01:00
Laurent Destailleur
043abdce03 Fix sql error 2016-03-08 20:30:09 +01:00
Laurent Destailleur
9f3f477877 FIX Navigation in result 2016-03-08 20:21:16 +01:00
Laurent Destailleur
881eca9fe5 Fix search on product ref 2016-03-08 19:46:42 +01:00
Laurent Destailleur
6d9bec9de1 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-08 17:32:00 +01:00
Laurent Destailleur
71246c864a FIX Bad td balance and default checkbox value 2016-03-08 17:31:46 +01:00
Marcos García de La Fuente
d43d0bfec1 Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation 2016-03-08 12:16:32 +01:00
Florian HENRY
4bf2da4af7 revert SQL changes 2016-03-08 10:24:59 +01:00
Florian HENRY
a8e2b49c5b FIX : #4768 2016-03-08 10:22:31 +01:00
philippe grand
44d71c2bb4 fix : missing translation 2016-03-08 09:08:31 +01:00
Florian HENRY
002a3888f4 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-07 10:57:46 +01:00
Juanjo Menent
9865b0daa3 Merge pull request #4735 from aspangaro/3.9-p16 
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
 2016-03-06 14:46:24 +01:00
Juanjo Menent
7a65ebe2b4 Merge pull request #4733 from grandoc/3.8 
3.8
 2016-03-06 14:45:48 +01:00
Juanjo Menent
5fb6db9da3 Merge pull request #4732 from hregis/3.8_bug 
Fix: compatibility with multicompany transversal mode
 2016-03-06 14:45:21 +01:00
Laurent Destailleur
894953c275 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-06 12:40:11 +01:00
Laurent Destailleur
3dbe27030e FIX If all banks account are reconcilable to off, we must not show nb of 
transactions to reconciles.
FIX Switching status reconcile on-off was broken.
 2016-03-06 12:39:59 +01:00
Laurent Destailleur
896f60a478 hidden solution to solve files overwriting each other 2016-03-06 00:47:00 +01:00
Laurent Destailleur
886aa1f8b6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-06 00:39:25 +01:00
Laurent Destailleur
210d8435da FIX The part added with hidden option MAIN_DOC_USE_TIMING was included 
with a . instead of -. This make os think it is part of extension
instead of file name.
 2016-03-06 00:39:13 +01:00
Laurent Destailleur
15ecf98bcb Fix responsive on smartphone 2016-03-05 02:11:20 +01:00
Laurent Destailleur
7a1af17585 FIX Responsive of demo selection page was not working 2016-03-05 01:40:52 +01:00
aspangaro
ae472b932c Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account 2016-03-04 20:45:47 +01:00
Regis Houssin
5292920a84 Fix: don't see the sales representative of anothers entities 2016-03-04 17:10:42 +01:00
Regis Houssin
735a1c075e Fix: best sql request 2016-03-04 16:48:53 +01:00
philippe grand
8ba8182c64 Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2016-03-04 16:32:33 +01:00
philippe grand
bd0320dea0 fix : missing traduction 2016-03-04 16:30:47 +01:00
Laurent Destailleur
a73b53ff9c Merge pull request #4728 from atm-ph/fix_send_mail_from_thirdparty 
Fix can't send mail to thirdparty contact if no mail defined on thirdparty card
 2016-03-04 16:18:15 +01:00
Laurent Destailleur
83ababeeac Merge pull request #4727 from hregis/3.8_fichinter 
Fix: wrong modelpdf var name
 2016-03-04 16:17:16 +01:00
Regis Houssin
967ae720ef Fix: compatibility with multicompany transversal mode 2016-03-04 15:51:34 +01:00
Laurent Destailleur
f06911a8b0 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/societe/commerciaux.php
 2016-03-04 15:39:55 +01:00
Laurent Destailleur
ca1860a08b Merge pull request #4720 from hregis/3.8_bug 
Fix: compatibility with multicompany transversal mode and more security issue
 2016-03-04 15:34:24 +01:00
Laurent Destailleur
fcb8c09414 Merge pull request #4721 from grandoc/3.9 
fix : missing translation
 2016-03-04 15:31:35 +01:00
Laurent Destailleur
c00860fdd5 Merge pull request #4719 from hregis/3.9_holiday 
Fix: best compatibility with multicompany and others security issue
 2016-03-04 15:30:18 +01:00
Laurent Destailleur
b6fd2a665e Merge pull request #4718 from grandoc/3.8 
fix : missing translation
 2016-03-04 15:22:04 +01:00
Laurent Destailleur
e92318bc13 Better fix to manage several level of beta and rc 2016-03-04 15:21:26 +01:00
Laurent Destailleur
84d2078919 Merge pull request #4710 from hregis/3.9_bug 
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
 2016-03-04 15:18:59 +01:00
Laurent Destailleur
9ffaf9b218 Merge remote-tracking branch 'origin/3.7' into 3.8 2016-03-04 14:51:59 +01:00
phf
e03f4b4de9 Fix can't send mail to thirdparty contact if no mail defined on thirdparty card 2016-03-04 12:21:14 +01:00
Regis Houssin
f9d8aba325 Fix: wrong modelpdf var name 2016-03-04 11:48:46 +01:00
Laurent Destailleur
071ca6d1c4 Fix enable/disabled contract 2016-03-03 20:46:42 +01:00
Laurent Destailleur
8ea7effac6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-03 20:42:12 +01:00
Laurent Destailleur
09a9546c14 FIX Can not disabled an opened service line in a contract 2016-03-03 20:41:56 +01:00
Laurent Destailleur
99553c8230 FIX Can not disable an opened service on a contract 2016-03-03 20:39:38 +01:00
Laurent Destailleur
7dc5fd334f Italian vat to 22 2016-03-03 19:21:17 +01:00
philippe grand
6851c3fdb0 fix : missing translation 2016-03-03 16:18:07 +01:00
philippe grand
4a3509d350 fix : missing translation 2016-03-03 16:09:19 +01:00
philippe grand
74601a0b1d fix : missing translation 2016-03-03 16:01:50 +01:00
philippe grand
9e80a37947 fix : missing translation 2016-03-03 15:45:42 +01:00
philippe grand
9f798bc3fc fix : missing translation 2016-03-03 11:54:12 +01:00
Regis Houssin
6fd5334812 Fix: compatibility with multicompany transversal mode and more security 
issue
 2016-03-03 10:10:55 +01:00
Regis Houssin
25686e82c9 Fix: best compatibility with multicompany and others security issue 2016-03-03 08:49:24 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/admin.lib.php
 2016-03-02 23:07:42 +01:00
philippe grand
59c4559a78 fix : missing translation 2016-03-02 21:13:12 +01:00
Laurent Destailleur
7fbfbfc804 Merge pull request #4716 from marcosgdf/bug-4453-2 
FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field
 2016-03-02 20:59:08 +01:00
Laurent Destailleur
f7059d3490 Merge pull request #4712 from marcosgdf/bug-4434 
FIX #4434 Weird behaviour when enabling multiprices
 2016-03-02 20:56:03 +01:00
Laurent Destailleur
e50ab89bcd Merge pull request #4711 from marcosgdf/bug-4425 
FIX #4425 Missing "VAT" translation in supplier order popup
 2016-03-02 20:55:21 +01:00
Marcos García de La Fuente
6f5481896b FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field 
Close #4453
 2016-03-02 12:41:24 +01:00
Marcos García de La Fuente
7d336bd5d4 FIX #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property 
Close #4414
 2016-03-02 11:43:55 +01:00
Marcos García de La Fuente
aa45734683 FIX #4434 Weird behaviour when enabling multiprices 
Close #4434
 2016-03-02 11:38:40 +01:00
Marcos García de La Fuente
123d6fb6e5 FIX #4425 Missing "VAT" translation in supplier order popup 
Close #4425
 2016-03-02 11:29:42 +01:00
Regis Houssin
057188e1de Fix: comment debug lines 2016-03-02 11:26:43 +01:00
Regis Houssin
e9ac41fb24 Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2) 2016-03-02 11:23:57 +01:00
Marcos García de La Fuente
e63ab857d8 FIX #4583 Incorrect call of Categories::containing throws a DoliDB error 
Close #4583
 2016-03-02 11:21:56 +01:00
Laurent Destailleur
215b24df54 Merge pull request #4701 from atm-alexis/FIX_contract_fourn_price_deleted_on_update 
FIX contract line supplier data were deleted on update
 2016-03-02 01:04:39 +01:00
Laurent Destailleur
d39dca21d7 Add franc guinéen in currency 2016-03-01 22:48:35 +01:00
Alexis Algoud
72b532b7eb FIX non instanciated values 2016-03-01 11:31:27 +01:00
Laurent Destailleur
839b2074ce Merge pull request #4696 from aspangaro/3.9-p14 
Fix: 3.9rc2 Use getNomUrl to show account_parent instead of rowid of the accountancy account
 2016-03-01 01:47:56 +01:00
Laurent Destailleur
724f06a5eb Merge pull request #4694 from simnandez/3.9 
FIX : Remove bad migration file for this version
 2016-03-01 01:47:09 +01:00
Laurent Destailleur
2d6c2d4fa5 Merge pull request #4698 from fmarcet/3.8 
FIX: Status filter don't work
 2016-03-01 01:46:26 +01:00
Laurent Destailleur
a26f880843 Fix missing declarion of form 
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
 2016-03-01 00:59:42 +01:00
Frédéric FRANCE
10d04e63c1 Update bonprelevement.class.php 2016-02-29 22:59:08 +01:00
Laurent Destailleur
846d78dfba FIX Edition of delay (nb of days) for payment term "Immediate" was 
broken.
 2016-02-29 15:43:00 +01:00
Laurent Destailleur
a3d4340b82 Fix useless truncation 2016-02-29 15:30:52 +01:00
Laurent Destailleur
64374bec00 Fix avoid wrapping in select2 combo list 2016-02-29 15:28:06 +01:00
Florian HENRY
50decb35cd Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-29 11:11:37 +01:00
Laurent Destailleur
2eaa21ea5c Fix minor css error (pixel size must have "px"). Compatibility with old 
behaviour.
 2016-02-29 10:50:52 +01:00
Laurent Destailleur
d2c71fbf8f Fix alias name was visible twice. 2016-02-29 10:35:18 +01:00
Laurent Destailleur
21c7aacddb Fix add hidden option INVOICE_DEFAULT_UNPAYED_SORT_ORDER to be able to 
provide backward compatibility with old behaviour.
 2016-02-29 10:29:32 +01:00
fmarcet
77490bff71 FIX: Status filter don't work 2016-02-29 10:07:48 +01:00
Laurent Destailleur
4b28dadd6e More complete instruction to convert image to theme 2016-02-28 14:44:09 +01:00
Laurent Destailleur
b7e0faa332 More complete css 2016-02-28 14:01:21 +01:00
Laurent Destailleur
be9a144433 FIX Add a test to show bugged module with a bad declaration of 
dictionaries to avoid to see clean module to be breaked.
 2016-02-28 12:43:00 +01:00
Laurent Destailleur
39d6d16c02 Fix bad picto "shared project" 2016-02-27 19:20:11 +01:00
Laurent Destailleur
6b7551c5d2 Fix: Introduce hidden option to disable feature than hangs when too much 
data
 2016-02-27 19:12:45 +01:00
Laurent Destailleur
193699a1b3 Fix duration format 2016-02-27 18:47:02 +01:00
Laurent Destailleur
d644a3bc43 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-02-27 18:43:50 +01:00
Laurent Destailleur
1038e92354 FIX sql request and total for time spen for current month 2016-02-27 18:42:57 +01:00
Laurent Destailleur
5453f99e2e Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
 2016-02-27 18:33:39 +01:00
Laurent Destailleur
15503f12b9 FIX Removed a bugged list. Fixed another one to not count data of 
previous year.
 2016-02-27 18:29:01 +01:00
Laurent Destailleur
526ea743e0 Fix: the view my task must show only task you are assigned to 2016-02-27 17:56:59 +01:00