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

40306 Commits

Author SHA1 Message Date
Frédéric FRANCE
dc89e36583 Update card.php 2015-04-01 21:12:08 +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
Frédéric FRANCE
824d8ddb57 Delete phpinfo.php 2015-04-01 18:57:54 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
16a620f926 Fix: Deadlock situation (when order were canceled, no way to make 
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
 2015-04-01 16:07:22 +02:00
Laurent Destailleur
ad1e4134a9 Fix: bcc was lost if notif to bcc was also forced 2015-04-01 12:22:50 +02:00
Laurent Destailleur
1bc0f6c99f Fix: do not show end date when it is same than start date 2015-04-01 12:02:32 +02:00
Laurent Destailleur
293495467f Fix: Bad ref used into notification message 2015-04-01 11:30:48 +02:00
Laurent Destailleur
5fe5ec939d Fix: delivery date must not be autofill with current date 2015-04-01 10:54:24 +02:00
aspangaro
4918326958 Fixed: Wrong path to don.class in element project 2015-04-01 08:13:10 +02:00
Frédéric FRANCE
08e7cb2e84 Correction for tooltip 2015-03-31 21:57:48 +02:00
Frédéric FRANCE
f0ed848609 Update actioncomm.class.php 2015-03-31 21:38:38 +02:00
Frédéric FRANCE
9ee6fdd163 Tooltip of actioncomm show empty ref 2015-03-31 21:07:17 +02:00
aspangaro
309b059089 New: Add a button to purge criteria in bank lines list 2015-03-31 21:00:22 +02:00
Frédéric FRANCE
46af2caba1 Correction warning delay workboard propal 2015-03-31 18:51:24 +02:00
Frédéric FRANCE
fc5d7e57a2 Correction for workboard in compta/bank/index.php 2015-03-31 18:31:36 +02:00
Laurent Destailleur
39d0c15c15 Comment 2015-03-31 17:23:07 +02:00
Laurent Destailleur
29e049d4f9 Comment 2015-03-31 17:22:14 +02:00
Laurent Destailleur
c71efc8f2e Avoid pb with scrutinizer 2015-03-31 16:59:40 +02:00
Frédéric FRANCE
2a34ec9db1 Add badge 2015-03-31 16:26:32 +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
2bdca3d76b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-31 11:33:10 +02:00
Laurent Destailleur
2d50cc92b9 Differentiate title for customer and supplier orders/invoices. 2015-03-31 11:32:47 +02:00
frederic34
fe6227e93f Typo 2015-03-31 08:45:36 +02:00
frederic34
bab04258e0 Add document tab for contact 2015-03-30 18:15:29 +02:00
Frédéric FRANCE
e602c43e12 Add ORDER_CANCEL in interface_90_all_Demo.class.php 2015-03-30 12:14:35 +02:00
Laurent Destailleur
9d752c6fca Sync from transifex 2015-03-30 10:55:08 +02:00
Laurent Destailleur
86603b01dd Merge pull request #2504 from marcosgdf/constants 
Implemented constants for some object types and statuses
 2015-03-30 09:25:18 +02:00
Marcos García de La Fuente
1b7ffd80f1 Typo 2015-03-30 03:19:20 +02:00
Marcos García de La Fuente
831177ef99 Implemented constants for Product class 2015-03-30 03:14:07 +02:00
Laurent Destailleur
b83e9ea32f Merge branch 'loan' of https://github.com/frederic34/dolibarr into 
frederic34-loan

Conflicts:
	htdocs/compta/bank/ligne.php
 2015-03-30 02:56:26 +02:00
Marcos García de La Fuente
cc1d298f29 Merge branch 'develop' into constants 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture/class/facture.class.php
 2015-03-30 02:36:46 +02:00
Laurent Destailleur
63ec6febec Merge pull request #2502 from frederic34/patch-7 
Travis Fix don.class.php
 2015-03-30 02:00:26 +02:00
Laurent Destailleur
a3b5f35903 Merge pull request #2501 from frederic34/patch-5 
Travis Fix for donation.lib.php
 2015-03-30 02:00:14 +02:00
Laurent Destailleur
b66d8c9afc Merge pull request #2496 from aspangaro/develop-ER-patch1 
Fixed: HRM menu is not activated when only Expense Report module is acti...
 2015-03-30 01:59:50 +02:00
aspangaro
c22a563422 New: Add management for accounting account in admin donation & correct bugs 2015-03-29 21:04:20 +02:00
Frédéric FRANCE
6c26063fc8 Travis Fix don.clss.php 2015-03-29 18:29:09 +02:00
Frédéric FRANCE
bcd7516e25 Fix for donation.lib.php 2015-03-29 18:22:45 +02:00
frederic34
b6b1617741 Work on payment loan 2015-03-29 17:53:36 +02:00
Laurent Destailleur
73b2e0bd01 Merge pull request #2471 from marcosgdf/refactor 
refactor
 2015-03-29 16:17:36 +02:00
Laurent Destailleur
3cc4358e72 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/commande/liste.php
	htdocs/product/stock/product.php
 2015-03-29 15:24:17 +02:00
Laurent Destailleur
018a0d779f Fix translation 2015-03-29 15:18:10 +02:00
aspangaro
a715ccfcb8 Fixed: HRM menu is not activated when only Expense Report module is activated 2015-03-29 15:11:41 +02:00
Laurent Destailleur
661961876a Merge pull request #2485 from aspangaro/develop-patch2 
Fix: Missing language key
 2015-03-29 15:05:37 +02:00
Laurent Destailleur
af51415f8e Merge pull request #2486 from frederic34/patch-2 
PhotoInTooltip for getNomUrl company
 2015-03-29 15:05:25 +02:00
Laurent Destailleur
32bda97712 Merge pull request #2494 from aspangaro/develop-ReviewAssoc 
New: Review module donation
 2015-03-29 15:04:22 +02:00
Laurent Destailleur
b4c096de09 Merge pull request #2495 from frederic34/loan 
Debug payment loan
 2015-03-29 15:03:08 +02:00
aspangaro
96b7cac93f Delete useless line 2015-03-29 14:30:43 +02:00
aspangaro
ed493b651b Icons & fr_FR options not show 2015-03-29 14:29:53 +02:00
frederic34
7b9ba4bd26 debug payment 2015-03-29 13:37:17 +02:00
frederic34
bf3e78a63d Debug payment loan 2015-03-29 11:39:55 +02:00
aspangaro
a92f68a5ed Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-29 09:25:06 +02:00
aspangaro
c733249c75 Don Remove old file 2015-03-29 09:23:39 +02:00
aspangaro
ce6df7c022 Debug 2015-03-29 09:20:32 +02:00
Laurent Destailleur
b8bd27009e Simplify code 2015-03-28 18:32:53 +01:00
Ion Agorria
043d11d785 check if $mc is a valid global 2015-03-28 18:22:01 +01:00
Laurent Destailleur
4887a28f91 Merge pull request #2492 from IonAgorria/mc-fix 
Fix: Check if $mc is a valid global
 2015-03-28 18:20:28 +01:00
frederic34
be1595a187 Add tab for notes 2015-03-28 17:42:33 +01:00
Laurent Destailleur
3f5fe432e7 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-28 17:18:10 +01:00
Laurent Destailleur
b60a56dc94 Fix search on command 2015-03-28 17:17:55 +01:00
frederic34
af92174ae2 Small correction but unable to make loan payment 2015-03-28 17:15:07 +01:00
frederic34
7282a6faf2 Trans in Loan Calculator 2015-03-28 10:59:10 +01:00
frederic34
680317f250 Trans in Loan Calculator 2015-03-28 10:02:33 +01:00
Ion Agorria
1791631976 check if $mc is a valid global 2015-03-28 03:44:16 +01:00
frederic34
a0c7cedaf1 Tooltip for loan 2015-03-27 18:09:00 +01:00
frederic34
631c3d72e3 Correction for notes 2015-03-27 17:23:27 +01:00
frederic34
82b8fe6b7d Note private and Note public for loan 2015-03-27 17:13:52 +01:00
Frédéric FRANCE
375e0b7e2a PhotoInTooltip for getNomUrl company 2015-03-27 08:32:51 +01:00
aspangaro
9d25a1c7ed Fix: Missing language key 2015-03-27 06:59:21 +01:00
aspangaro
77b123cb2d Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-27 06:30:35 +01:00
Laurent Destailleur
cb16e069df Better explanation 2015-03-27 01:17:21 +01:00
Laurent Destailleur
e777516f38 Merge pull request #2483 from FHenry/3.7 
FIX : fetch actioncomm return 0 if no record found instead of nothing
 2015-03-27 01:10:28 +01:00
Laurent Destailleur
d0e4d8046b Merge pull request #2480 from marcosgdf/minor-2 
Corrected search box alignment in Customer orders list
 2015-03-27 01:09:06 +01:00
Laurent Destailleur
39f46227c8 Merge pull request #2479 from marcosgdf/minor 
Merge branch 'develop' into minor
 2015-03-27 01:08:23 +01:00
Laurent Destailleur
60c24f7162 Merge pull request #2478 from frederic34/listexpe 
Add last shipments to company card
 2015-03-27 01:04:05 +01:00
Laurent Destailleur
813cb36424 Merge pull request #2476 from fmarcet/3.7 
Fix: Not using where on sellist
 2015-03-27 00:50:48 +01:00
aspangaro
f0823a215b Add language key 2015-03-26 21:16:52 +01:00
aspangaro
4209deafd2 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-26 21:04:20 +01:00
aspangaro
6a0916b3fa Correct path 2015-03-26 21:03:56 +01:00
aspangaro
a39f81b1a6 FIXED: Correct path of loan class 2015-03-26 20:51:27 +01:00
aspangaro
059bb40345 Debug 2015-03-26 20:43:34 +01:00
Florian HENRY
2e13479e8f Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-26 16:56:06 +01:00
Florian HENRY
26c29216d9 syntax 2015-03-26 16:55:13 +01:00
Laurent Destailleur
42c2c81e28 Fix detection of html was wrong with img 2015-03-26 12:05:52 +01:00
Laurent Destailleur
1ca95acbd7 Fix pb during export of agenda events 
Conflicts:
	htdocs/exports/export.php
 2015-03-26 11:23:21 +01:00
Laurent Destailleur
ce8bd7a515 Fix pb during export of agenda events 2015-03-26 11:20:39 +01:00
Marcos García de La Fuente
e59fed9f38 Corrected search box alignment in Customer orders list 2015-03-26 11:08:34 +01:00
Marcos García de La Fuente
b83ef4c1ec Merge branch 'develop' into minor 2015-03-26 10:58:35 +01:00
Marcos García de La Fuente
50a3563f03 Minor correction to the product list of a supplier 2015-03-26 10:57:13 +01:00
aspangaro
b60f1e33d6 Debug 2015-03-26 06:29:16 +01:00
aspangaro
8d4ceadd7e Dir "Don" 2015-03-25 22:38:44 +01:00
aspangaro
2b2b43afb6 Dir "Don" 2015-03-25 22:37:14 +01:00
aspangaro
679391d337 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-25 20:59:48 +01:00
Laurent Destailleur
f7b8a2b036 Restore align=right 2015-03-25 18:13:53 +01:00
Laurent Destailleur
ab739e162c Merge remote-tracking branch 'origin/3.7' into develop 2015-03-25 18:11:29 +01:00
Laurent Destailleur
8be08c692f Fix some secuity tests were not done. 2015-03-25 18:10:45 +01:00
frederic34
19540b14b5 Add last shipments to company card 2015-03-25 16:38:18 +01:00
Maxime Kohlhaas
b250c5588e Fix : Quantity displayed for virtual stock explanations was wrong 2015-03-25 16:11:36 +01:00
Laurent Destailleur
21b1f7cc26 Fix bad calculation of email for notifications 2015-03-25 14:51:12 +01:00
Laurent Destailleur
cc2d86bd58 Status of project was not visible on thirdparty card 2015-03-25 14:31:04 +01:00