Laurent Destailleur
|
74deb05527
|
Clean code. Use constant for status of supplier order process.
|
2017-10-07 13:04:31 +02:00 |
|
Laurent Destailleur
|
d28188d19d
|
FIX Generation of invoice from bulk action "Bill Orders"
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2017-10-04 14:31:52 +02:00 |
|
Laurent Destailleur
|
a74d6074a3
|
FIX Generation of invoice from bulk action "Bill Orders"
|
2017-10-04 14:27:10 +02:00 |
|
Laurent Destailleur
|
c22cd1cfe9
|
Fix test on entity must always be done using the "IN" instead of "="
|
2017-10-03 17:41:22 +02:00 |
|
Laurent Destailleur
|
f2e0ff0d30
|
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
|
2017-10-03 17:25:01 +02:00 |
|
Laurent Destailleur
|
2f20de2457
|
Fix cancel button on create
|
2017-10-03 14:57:38 +02:00 |
|
Regis Houssin
|
09e71f1390
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-10-02 11:51:27 +02:00 |
|
Laurent Destailleur
|
f007f9e7e5
|
NEW Add new property visible dy default on lists on extrafields
|
2017-09-29 13:26:44 +02:00 |
|
Regis Houssin
|
9823d6622c
|
Fix: use default $shared value
|
2017-09-27 17:40:02 +02:00 |
|
Regis Houssin
|
20684b4505
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
|
2017-09-27 17:22:18 +02:00 |
|
Laurent Destailleur
|
c9e9f60f8f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-09-25 19:55:52 +02:00 |
|
Laurent Destailleur
|
c5287e68b1
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/admin/multicurrency.php
htdocs/core/modules/modFournisseur.class.php
|
2017-09-25 19:54:27 +02:00 |
|
Regis Houssin
|
d592664150
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-09-25 06:48:26 +02:00 |
|
Laurent Destailleur
|
e3da4188e2
|
GETPOST must not clean data for text input.
|
2017-09-25 00:16:52 +02:00 |
|
Laurent Destailleur
|
f990667b1a
|
NEW Can send email from the member card using email templates.
|
2017-09-22 17:48:38 +02:00 |
|
TuxGasy
|
4043141ae3
|
Allow create shipping if STOCK_SUPPORTS_SERVICES option is enabled
|
2017-09-18 14:11:21 +02:00 |
|
Regis Houssin
|
a03ef95eaa
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
|
2017-09-18 09:11:04 +02:00 |
|
Laurent Destailleur
|
ab5724e7ff
|
Mutualize code for forms to send emails. Remove thousand line of code.
|
2017-09-17 17:12:14 +02:00 |
|
Laurent Destailleur
|
e014ac6ea9
|
NEW Send by email available in bulk for expense report
|
2017-09-16 22:03:25 +02:00 |
|
Laurent Destailleur
|
b4eab24490
|
Add project into list of customer orders
|
2017-09-16 20:32:28 +02:00 |
|
Laurent Destailleur
|
0fec777d0e
|
NEW On bulk email from a list, can uncheck "Join main document".
NEW Show direct preview link on contract
|
2017-09-16 18:31:30 +02:00 |
|
Laurent Destailleur
|
630dc92a13
|
NEW Mass PDF Merging is available on contracts
|
2017-09-16 15:39:52 +02:00 |
|
Regis Houssin
|
db17eb80ec
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
|
2017-09-15 16:45:49 +02:00 |
|
Laurent Destailleur
|
5e34b121dd
|
Add more robust php unit to detect not escaped sql. Fix not escaped sql
|
2017-09-15 15:41:07 +02:00 |
|
Laurent Destailleur
|
e02c220c08
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-09-15 11:04:27 +02:00 |
|
Laurent Destailleur
|
cce1549f66
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/card.php
htdocs/public/members/new.php
|
2017-09-15 11:02:34 +02:00 |
|
Laurent Destailleur
|
0873260b8a
|
USe second parameter in GETPOST
|
2017-09-15 10:50:50 +02:00 |
|
Laurent Destailleur
|
2798726dba
|
Update card.php
|
2017-09-14 13:23:28 +02:00 |
|
Laurent Destailleur
|
51d1c35399
|
Merge pull request #7380 from tysauron/patch-8
$soc->getAvailableDiscounts . where soc not set.
|
2017-09-14 12:12:20 +02:00 |
|
Regis Houssin
|
a494e01f00
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-09-14 12:07:19 +02:00 |
|
Stéphane BERTHELOT
|
93defa5f59
|
Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)
|
2017-09-14 12:06:25 +02:00 |
|
Laurent Destailleur
|
165c3ac112
|
Merge pull request #7374 from EmisFR/develop
Fix dates in commande and remisecheque for PostgreSQL
|
2017-09-14 12:05:51 +02:00 |
|
TuxGasy
|
f0983353f2
|
Fix #7387 : filter clsed company when create new documents
|
2017-09-14 12:01:35 +02:00 |
|
Laurent Destailleur
|
149ab80b3a
|
The event array of an object is visible even if no event yet recorded.
|
2017-09-13 14:18:36 +02:00 |
|
Laurent Destailleur
|
71ce82b6b9
|
NEW Better autoselect customer or supplier fields to save clicks
|
2017-09-12 16:51:10 +02:00 |
|
tysauron
|
afac908fda
|
$soc->getAvailableDiscounts . where soc not set.
|
2017-09-12 12:35:06 +02:00 |
|
Stéphane BERTHELOT
|
66f671f4c8
|
Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings)
|
2017-09-11 18:01:24 +02:00 |
|
Laurent Destailleur
|
b87ce172c3
|
FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
|
2017-09-11 13:40:34 +02:00 |
|
Laurent Destailleur
|
59ab52c718
|
FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
|
2017-09-11 13:39:03 +02:00 |
|
Regis Houssin
|
b5de8da3a6
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
|
2017-09-11 08:07:55 +02:00 |
|
Laurent Destailleur
|
259cca0230
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
|
2017-09-08 13:30:54 +02:00 |
|
Laurent Destailleur
|
03fe9d4e97
|
Escape all status
|
2017-09-08 13:23:12 +02:00 |
|
Laurent Destailleur
|
bde293af22
|
Fix filter on extrafield with type sellist
|
2017-09-07 15:34:25 +02:00 |
|
Regis Houssin
|
66e548427c
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-09-07 10:50:35 +02:00 |
|
Laurent Destailleur
|
4b9f54e571
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
|
2017-09-01 17:34:57 +02:00 |
|
Regis Houssin
|
8e8f94df11
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
|
2017-08-30 19:33:23 +02:00 |
|
Laurent Destailleur
|
d3c95e030b
|
Fix delete file not possible for external user even with permissions
|
2017-08-30 14:34:36 +02:00 |
|
Laurent Destailleur
|
7aa09d8b71
|
NEW Can create thirdparty from card proposal, order or invoice
|
2017-08-28 18:37:16 +02:00 |
|
Regis Houssin
|
2f537a1ade
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-08-22 18:49:40 +02:00 |
|
Laurent Destailleur
|
81b11100b0
|
Prepare code to clone site an fetch external page
|
2017-08-03 01:45:31 +02:00 |
|
Laurent Destailleur
|
5b1f5b0f20
|
Fix translation done twice into field title of array
|
2017-08-02 13:31:53 +02:00 |
|
Regis Houssin
|
0dc0fe81fc
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-31 07:40:01 +02:00 |
|
Laurent Destailleur
|
60493d0a47
|
Several fixes (permission, missing method or class) in REST APIs
|
2017-07-28 11:03:30 +02:00 |
|
Regis Houssin
|
acd5780e32
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-26 08:58:56 +02:00 |
|
Laurent Destailleur
|
cba898e2b9
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture.php
|
2017-07-25 10:12:28 +02:00 |
|
Laurent Destailleur
|
aa9b4ce1f3
|
Fix too long combo for tags
|
2017-07-25 09:49:08 +02:00 |
|
Laurent Destailleur
|
25b107defb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
|
2017-07-23 19:09:00 +02:00 |
|
Regis Houssin
|
26df1389f4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
|
2017-07-21 20:42:21 +02:00 |
|
Laurent Destailleur
|
d07741ada1
|
Merge branch 'develop' into patch-rib
|
2017-07-21 14:58:33 +02:00 |
|
Regis Houssin
|
c8bd11660d
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-07-18 15:23:43 +02:00 |
|
Laurent Destailleur
|
98cb1b7af1
|
Merge pull request #7171 from atm-ph/fix_5.0_search_lost
Fix lost search value in list if come from thirdparty card
|
2017-07-18 14:48:38 +02:00 |
|
Laurent Destailleur
|
b2c00ac463
|
Merge pull request #7161 from hguibourgdev/patch-4
Patch 4
|
2017-07-18 14:38:34 +02:00 |
|
phf
|
885fc3c5b7
|
Fix lost search value in list if come from thirdparty card
|
2017-07-17 11:04:48 +02:00 |
|
Regis Houssin
|
200f232164
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-16 07:51:20 +02:00 |
|
hguibourgdev
|
2166b3d467
|
Update card.php
FIX "!" is missing on test : empty($object->date_livraison)
|
2017-07-15 12:04:59 +02:00 |
|
Laurent Destailleur
|
743de4e586
|
FIX Option to classify proposal/order in workflow module must not set
source object to billed if amount differs.
|
2017-07-13 12:42:32 +02:00 |
|
Laurent Destailleur
|
0b4a1d9b65
|
Protection to avoid mass action execution when not required
|
2017-07-13 02:49:40 +02:00 |
|
Laurent Destailleur
|
9127892c71
|
Fix several minor bugs
|
2017-07-13 02:33:48 +02:00 |
|
Laurent Destailleur
|
2870798d07
|
Fix remove warnings
|
2017-07-13 00:35:10 +02:00 |
|
Regis Houssin
|
cb6b81d897
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-11 19:10:22 +02:00 |
|
Laurent Destailleur
|
8a9c38114f
|
Fix bug reported by scrutinizer
|
2017-07-08 19:05:51 +02:00 |
|
Laurent Destailleur
|
f40afcf023
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
|
2017-07-08 18:32:34 +02:00 |
|
Laurent Destailleur
|
ba3b6b6aa5
|
Better support of vat with code in expense report
|
2017-07-08 18:09:45 +02:00 |
|
Laurent Destailleur
|
34d0c79e32
|
Merge pull request #7124 from fappels/develop_updateline_notriggerflag
New add trigger disable to updateline functions
|
2017-07-07 20:30:04 +02:00 |
|
Laurent Destailleur
|
47c6a324ac
|
Merge pull request #7086 from OPEN-DSI/core_commande_warning_delay_dashboard
FIX: Function load_board in commande.class.php for warnings delay in dashboard
|
2017-07-07 18:56:31 +02:00 |
|
Laurent Destailleur
|
252d8da8fc
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2017-07-07 15:11:53 +02:00 |
|
fappels
|
6effcb0829
|
New add trigger disable to updateline functions
|
2017-07-06 16:26:15 +02:00 |
|
Regis Houssin
|
3f882cb33a
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-07-03 09:24:05 +02:00 |
|
Laurent Destailleur
|
7ae52d843c
|
Look and feel v6
|
2017-07-01 14:23:24 +02:00 |
|
Laurent Destailleur
|
d55213286e
|
Fix missing parameter
|
2017-06-30 11:40:26 +02:00 |
|
KHELIFA
|
7dc4eeddf0
|
FIX: Function load_board in commande.class.php for warnings delay in dashboard
|
2017-06-29 16:44:52 +02:00 |
|
Regis Houssin
|
fa247ffd98
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-29 08:51:42 +02:00 |
|
Laurent Destailleur
|
6f82837b0f
|
Fix GETPOST of lang_id
|
2017-06-27 17:27:01 +02:00 |
|
Laurent Destailleur
|
4102403482
|
Look and feel v6
|
2017-06-21 11:37:34 +02:00 |
|
Regis Houssin
|
2fffd2fa6f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-06-20 23:26:21 +02:00 |
|
Laurent Destailleur
|
08a86fa03d
|
Start #6981
|
2017-06-20 12:17:13 +02:00 |
|
Regis Houssin
|
909826e24f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-20 06:25:35 +02:00 |
|
Laurent Destailleur
|
bb2d27280b
|
Fix sort link must be disabled for computed field
|
2017-06-19 14:31:08 +02:00 |
|
Regis Houssin
|
a0299042e4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-17 12:05:33 +02:00 |
|
Laurent Destailleur
|
5b7a8e9c90
|
Fix missing signature when sending email from user card
|
2017-06-17 10:17:36 +02:00 |
|
Regis Houssin
|
cd095e99c9
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-14 12:16:10 +02:00 |
|
Laurent Destailleur
|
1b56e4a01c
|
Fix look and feel v6
|
2017-06-14 11:28:42 +02:00 |
|
Regis Houssin
|
d1233755f6
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-06-11 11:41:02 +02:00 |
|
Laurent Destailleur
|
a96362e2f9
|
Fix #formmailbeforetitle not supported everywhere
|
2017-06-11 11:40:01 +02:00 |
|
Regis Houssin
|
cc75916599
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-06-11 11:26:24 +02:00 |
|
Laurent Destailleur
|
e93cefbbf0
|
FIX #6985
|
2017-06-11 10:37:58 +02:00 |
|
Regis Houssin
|
3445c9d329
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
|
2017-06-11 06:27:49 +02:00 |
|
Laurent Destailleur
|
7c0de18ac1
|
Fix code comment
|
2017-06-10 12:56:28 +02:00 |
|
Laurent Destailleur
|
3347316d3c
|
Fix delete of member
|
2017-06-09 17:02:05 +02:00 |
|
Regis Houssin
|
58b3d86b49
|
Fix: errors
|
2017-06-09 09:40:43 +02:00 |
|
Regis Houssin
|
fa58f0f3e8
|
Fix: add entity filter
|
2017-06-09 09:25:15 +02:00 |
|
Laurent Destailleur
|
b441c62e1d
|
Fix syntax error
|
2017-06-08 14:55:12 +02:00 |
|
Laurent Destailleur
|
b1f93ccb0c
|
Fix security
|
2017-06-08 14:33:46 +02:00 |
|
Regis Houssin
|
2b36135641
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_mc
|
2017-06-07 20:14:03 +02:00 |
|
Laurent Destailleur
|
1820649175
|
Maxi debug of v6
|
2017-06-07 19:28:31 +02:00 |
|
Regis Houssin
|
bfd6116e5b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
|
2017-06-06 15:03:36 +02:00 |
|
Laurent Destailleur
|
02b5d9e6f7
|
FIX #6945
|
2017-06-06 10:53:53 +02:00 |
|
Regis Houssin
|
5c5663c5ae
|
New: getEntity function use true $shared value by default
|
2017-05-30 18:50:54 +02:00 |
|
Laurent Destailleur
|
f5e29d6c86
|
Fix phpcs warning
|
2017-05-22 10:45:02 +02:00 |
|
Laurent Destailleur
|
b3dc73e611
|
Look and feel v6
|
2017-05-21 02:43:51 +02:00 |
|
Laurent Destailleur
|
2021758403
|
Merge pull request #6834 from atm-ph/fix_fk_project_on_create_order_from_propal
Fix fk project on create order from propal
|
2017-05-20 12:13:42 +02:00 |
|
Laurent Destailleur
|
470165615f
|
Fix look and feel v6
|
2017-05-19 16:32:23 +02:00 |
|
Laurent Destailleur
|
aec4cef5de
|
Clean some code for type of event deprecated since 3.3
|
2017-05-19 12:58:38 +02:00 |
|
Laurent Destailleur
|
7dbe3b1da9
|
Merge pull request #6843 from aspangaro/6.0-multijournal
Fix : Sql error on salaries index for accountancy multijournal + debug
|
2017-05-18 17:45:21 +02:00 |
|
Laurent Destailleur
|
ff5d682d49
|
Fix css
|
2017-05-18 03:12:29 +02:00 |
|
Laurent Destailleur
|
b0f0285137
|
Standardize code
|
2017-05-16 21:29:18 +02:00 |
|
Laurent Destailleur
|
68e333879f
|
Fix var not sanitized
|
2017-05-16 13:27:32 +02:00 |
|
phf
|
4d9016c49f
|
Fix create propal form from propal with project id, fk_project is not used to init select project
|
2017-05-15 10:12:58 +02:00 |
|
Alexandre SPANGARO
|
93554b7e30
|
Typo searchpicto
|
2017-05-14 21:06:33 +02:00 |
|
Laurent Destailleur
|
b568877f22
|
Merge pull request #6829 from grandoc/new_branch_10_05
Update code using new css class
|
2017-05-13 19:47:27 +02:00 |
|
Laurent Destailleur
|
553f5b990c
|
Fix scrutinizer errors
|
2017-05-13 18:50:55 +02:00 |
|
Laurent Destailleur
|
0d11fce834
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-12 15:45:30 +02:00 |
|
Laurent Destailleur
|
b81de35703
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
|
2017-05-12 15:44:09 +02:00 |
|
Laurent Destailleur
|
419c15ee8e
|
Fix escaping class
|
2017-05-12 15:28:10 +02:00 |
|
Laurent Destailleur
|
30cf3f2bda
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
|
2017-05-11 00:03:06 +02:00 |
|
Laurent Destailleur
|
922fa088b4
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/boxes/box_services_expired.php
|
2017-05-10 23:47:33 +02:00 |
|
Laurent Destailleur
|
b2e9d4cc21
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-05-10 23:42:49 +02:00 |
|
philippe grand
|
b7b16dc632
|
Update code using new css class
|
2017-05-10 16:41:19 +02:00 |
|
Laurent Destailleur
|
5e54567558
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/skeletons/skeleton_list.php
|
2017-05-10 13:30:35 +02:00 |
|
Laurent Destailleur
|
3e0fcf5ec2
|
Fix label "total for this page" on last page.
|
2017-05-10 11:57:59 +02:00 |
|
Laurent Destailleur
|
e5c898e0d6
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
|
2017-05-10 00:48:27 +02:00 |
|
Laurent Destailleur
|
6d01bd712d
|
FIX Better sanitizing of search all parameter.
|
2017-05-09 19:36:10 +02:00 |
|
Ferran Marcet
|
dbcb60433b
|
FIX: Correction with author and validator user on orders
|
2017-05-09 13:31:20 +02:00 |
|
Laurent Destailleur
|
11b1a2adac
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
|
2017-05-05 14:49:25 +02:00 |
|
Laurent Dinclaux
|
24a2fb57ea
|
Resolved merge conflict
|
2017-05-05 10:22:46 +11:00 |
|
Laurent Dinclaux
|
909b489d1f
|
More fixes regarding localtaxes not being diplayed in generated PDF and vat_src_code not being propagating properly when generating posts from type to type.
|
2017-05-04 10:05:55 +11:00 |
|
Laurent Dinclaux
|
421843e693
|
Fix missing localtaxes lines in "commande" PDF
|
2017-05-03 23:35:57 +11:00 |
|
Laurent Dinclaux
|
f63f28c7fe
|
Fix vat_src_code propagation between post types
|
2017-05-03 21:37:30 +11:00 |
|
Laurent Destailleur
|
3917bdfc79
|
Fix vat_src_code propagation.
|
2017-05-02 22:37:43 +02:00 |
|
Laurent Destailleur
|
865c8140d1
|
Clean code
|
2017-04-30 03:23:06 +02:00 |
|
Laurent Destailleur
|
cfde27820e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
|
2017-04-27 17:20:40 +02:00 |
|
Philippe Grand
|
c18e7e8816
|
Merge branch 'develop' into testing
|
2017-04-19 11:27:36 +02:00 |
|
Maxime Kohlhaas
|
402924f6d7
|
Fix : no origin on stock mvmt when order set back to draft
|
2017-04-14 15:12:32 +02:00 |
|
Laurent Destailleur
|
846204bdb4
|
Replace usage of $bc[$var] with class="oddeven"
|
2017-04-14 13:02:29 +02:00 |
|
Laurent Destailleur
|
39ebaec064
|
Replace usage of $bc[$var] with class="oddeven"
|
2017-04-14 11:22:48 +02:00 |
|
Laurent Destailleur
|
3e9ccc186a
|
NEW Small PDF template for products
|
2017-04-13 10:26:12 +02:00 |
|
Laurent Destailleur
|
26a9999fbf
|
Support of preview for pdf with several pages
|
2017-04-12 11:38:55 +02:00 |
|
philippe grand
|
c3387cb4e6
|
ref column was missing for specimen and some update
|
2017-04-11 14:54:34 +02:00 |
|
Laurent Destailleur
|
b054ca8267
|
NEW Introduce mass action on product list ('delete' for the moment)
|
2017-04-09 15:02:55 +02:00 |
|
Laurent Destailleur
|
0a47245ba5
|
NEW Add mass actions (pdf merge and delete) for interventions
|
2017-04-09 14:31:56 +02:00 |
|